--- a/common/radio_global.h Fri Jun 11 13:38:32 2010 +0300
+++ b/common/radio_global.h Fri Jun 25 19:09:05 2010 +0300
@@ -36,6 +36,14 @@
*/
const int MAXIMUM_VOLUME_LEVEL = 20;
+/**
+ * Default volume level that is used when no previous setting exists
+ */
+const int DEFAULT_VOLUME_LEVEL = 4;
+
+/**
+ * Roles used when interacting with the radio station model
+ */
namespace RadioRole
{
enum Role
--- a/common/radioservicedef.h Fri Jun 11 13:38:32 2010 +0300
+++ b/common/radioservicedef.h Fri Jun 25 19:09:05 2010 +0300
@@ -20,8 +20,13 @@
#include <QLatin1String>
-static const QLatin1String RADIO_CONTROL_SERVICE( "com.nokia.services.Radio.IRadioControl" );
-static const QLatin1String RADIO_MONITOR_SERVICE( "com.nokia.services.Radio.IRadioMonitor" );
+static const QLatin1String RADIO_SERVICE( "fmradio" );
+static const QLatin1String RADIO_CONTROL_SERVICE( "com.nokia.symbian.IRadioControl" );
+static const QLatin1String RADIO_CONTROL_SERVICE_OPERATION( "command(int)" );
+static const QLatin1String RADIO_MONITOR_SERVICE( "com.nokia.symbian.IRadioMonitor" );
+static const QLatin1String RADIO_MONITOR_SERVICE_OPERATION( "requestNotifications()" );
+static const QLatin1String RADIO_MONITOR_SERVICE_REFRESH_OPERATION( "requestAllData()" );
+
const long KRadioPSUid = 0x101FF976;
const unsigned long KRadioStartupKey = 0x00000014;
--- a/hswidgetplugin/buildflags.pri Fri Jun 11 13:38:32 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +0,0 @@
-#
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description:
-#
-
-# ##########################################################
-# Start of Flag definitions
-# Add or remove comments to disable or enable the features
-# ##########################################################
-
-# ##########################################################
-# Start of Logging flag definitions
-# ##########################################################
-
-# Full logging flag that enables the full logging including also timestamps
-# Enabled by default in debug builds
-CONFIG(debug, debug|release) : LOGGING_FLAGS += LOGGING_ENABLED
-
-# Uncomment to enable full logging in release builds
-# LOGGING_FLAGS *= LOGGING_ENABLED
-
-# Timestamp logging flag that enables only timestamp logging
-# LOGGING_FLAGS += TIMESTAMP_LOGGING_ENABLED
-
-# Combines Ui and Engine logs by feeding UI traces to the engine logger
-# LOGGING_FLAGS += COMBINE_WITH_ENGINE_LOGGER
-
-# Logging level
-# 1 - Normal level
-# 2 - More verbose level
-# 3 - Most verbose level
-LOGGING_FLAGS += LOGGING_LEVEL=1
-
-# Select which radio component is being logged
-# 1 - Radio application
-# 2 - Radio homescreen widget
-LOGGING_FLAGS += LOGGED_COMPONENT=2
-
-contains(LOGGING_FLAGS, TIMESTAMP_LOGGING_ENABLED)|contains(LOGGING_FLAGS, LOGGING_ENABLED) {
-
- # Writes debug prints to file if enabled
- #LOGGING_FLAGS += TRACE_TO_FILE
-
- # Settings for the log file name
- symbian:contains(LOGGING_FLAGS, TRACE_TO_FILE) {
- LOGGING_FLAGS += \"TRACE_OUTPUT_FILE=\\\"c:/logs/radio/fmradiohswidget.txt\\\"\"
- LOGGING_FLAGS += FILTER_BY_LOGMARKER=true
- }
-}
-
-# Method for testing signal-slot connections
-# 1 - Log failed connection
-# 2 - Log failed connection and halt debugger
-LOGGING_FLAGS += CONNECT_TEST_MODE=2
-
-# Logging is always enabled in Win32 environment
-win32:LOGGING_FLAGS *= LOGGING_ENABLED
-
-DEFINES += $$LOGGING_FLAGS
-
-# ##########################################################
-# End of Flag definitions
-# ##########################################################
-
-# $$_PRO_FILE_PWD_ points to the directory of the pro file
-MOC_DIR = $$_PRO_FILE_PWD_/tmp
-RCC_DIR = $$_PRO_FILE_PWD_/tmp
-OBJECTS_DIR = $$_PRO_FILE_PWD_/tmp
-UI_DIR = $$_PRO_FILE_PWD_/tmp
-UI_HEADERS_DIR = $$_PRO_FILE_PWD_/tmp
-UI_SOURCES_DIR = $$_PRO_FILE_PWD_/tmp
--- a/hswidgetplugin/fmradiohswidgetplugin/fmradiohswidgetplugin.pro Fri Jun 11 13:38:32 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,88 +0,0 @@
-#
-# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description: Example of home screen widget
-#
-
-include(../buildflags.pri)
-
-TEMPLATE = lib
-CONFIG += plugin mobility hb
-MOBILITY = serviceframework
-# Traslations is waiting for the widget specific ts
-#TRANSLATIONS += $${TARGET}.ts
-
-LIBS += -lxqsettingsmanager \
- -lxqservice \
- -lxqserviceutil
-
-HEADERS += ./inc/*.h
-SOURCES += ./src/*.cpp
-SOURCES += ../../common/radiologger.cpp
-
-INCLUDEPATH += ./inc
-INCLUDEPATH += ../../common
-
-UID = 2002E6D6
-
-RESOURCES = resources.qrc
-#exportResources(./resource/$${TARGET}_icon*.png, $$PLUGIN_SUBDIR)
-
-symbian: {
-
- DESTDIR = /private/20022F35/import/widgetregistry/$${UID}
- INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
-
- TARGET.UID3 = 0x$${UID}
- TARGET.EPOCALLOWDLLDATA=1
- TARGET.VID = VID_DEFAULT
- TARGET.CAPABILITY = CAP_GENERAL_DLL
-
- plugins.path = $${DESTDIR}
- plugins.sources = $${TARGET}.dll
-
- widgetResources.path = $${DESTDIR}
- widgetResources.sources += resource/$${TARGET}.xml
- widgetResources.sources += resource/$${TARGET}.manifest
- # icon is now removed to be able to unistall the widget more easily.
- #widgetResources.sources += resource/$${TARGET}_icon*.png
-
- localisedFiles.path = /resource/qt/translations
- localisedFiles.sources += ./locales/*.qm
-
- DEPLOYMENT += plugins \
- widgetResources \
- localisedFiles
-}
-
-win32: {
-
- CONFIG(debug, debug|release) {
- SUBDIRPART = debug
- } else {
- SUBDIRPART = release
- }
-
- PLUGIN_SUBDIR = /hsresources/import/widgetregistry/$${UID}
-
- DESTDIR = $$PWD/../../../../../bin/$${SUBDIRPART}/$${PLUGIN_SUBDIR}
-
- manifest.path = $${DESTDIR}
- manifest.files = ./resource/*.manifest ./resource/*.xml ./resource/*.css #./resource/*.png
-
- widgetLocalisation.path = $$PWD/../../../../../bin/$${SUBDIRPART}/resource/qt/translations
- widgetLocalisation.files += ./locales/*.qm
-
- INSTALLS += manifest
-}
-
--- a/hswidgetplugin/fmradiohswidgetplugin/fmradiohswidgetplugin.xml Fri Jun 11 13:38:32 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<service>
- <name>fmradiohswidgetplugin</name>
- <filepath>c:/private/20022F35/import/widgetregistry/2002E6D6/fmradiohswidgetplugin.qtplugin</filepath>
- <description>FM Radio homescreen widget</description>
- <interface>
- <name>com.nokia.IHomeScreenWidget</name>
- <version>1.0</version>
- <description>FM Radio homescreen widget</description>
- <capabilities></capabilities>
- <customproperty key="iconuri">fmradiohswidgetplugin_icon.png</customproperty>
- <customproperty key="title">FM Radio Widget</customproperty>
- </interface>
-</service>
--- a/hswidgetplugin/fmradiohswidgetplugin/inc/fmradiohswidget.h Fri Jun 11 13:38:32 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,202 +0,0 @@
-/*
-* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: FM Radio home screen widget
-*
-*/
-
-#ifndef FMRADIOHSWIDGET_H
-#define FMRADIOHSWIDGET_H
-
-// System includes
-#include <HbWidget>
-
-// User includes
-#include "fmradiohswidgetradioserviceclient.h"
-
-// Forward declarations
-class HbLabel;
-class HbPushButton;
-class HbMarqueeItem;
-class XQSettingsManager;
-class XQSettingsKey;
-class FmRadioHsWidgetProcessHandler;
-class FmRadioHsWidgetProfileReader;
-class QGraphicsLinearLayout;
-
-// Constants
-/** Path to docml file */
-const QString KDocml = ":/ui/resource/fmradiohswidget.docml";
-/** Path to css file */
-const QString KCss = ":/ui/resource/fmradiohswidgetplugin.css";
-/** Key for radio information hash. */
-const QString KRadioInformationStationName = "stationName";
-/** Key for radio information hash. */
-const QString KRadioInformationFrequency = "frequency";
-/** Key for radio information hash. */
-const QString KRadioInformationRt = "rt";
-/** Key for radio information hash. */
-const QString KRadioInformationDynamicPsName = "dynamicPsName";
-/** Key for radio information hash. */
-const QString KRadioInformationPty = "pty";
-/** DOCML object name for mainLayout */
-const QString KDocmlObjectNameMainLayout = "mainLayout";
-/** DOCML object name for tunerBackgroundPushButton */
-const QString KDocmlObjectNameTunerBackgroundPushButton = "tunerBackgroundPushButton";
-/** DOCML object name for tunerStackedLayout */
-const QString KDocmlObjectNameTunerStackedLayout = "tunerStackedLayout";
-/** DOCML object name for tunerInformationStackedLayout */
-const QString KDocmlObjectNameTunerInformationStackedLayout = "tunerInformationStackedLayout";
-/** DOCML object name for controlButtons */
-const QString KDocmlObjectNameContolButtonsLayout = "controlButtons";
-/** DOCML object name for powerToggleButton */
-const QString KDocmlObjectNameowerToggleButton = "powerToggleButton";
-/** DOCML object name for previousPushButton */
-const QString KDocmlObjectNamePreviousPushButton = "previousPushButton";
-/** DOCML object name for nextPushButton */
-const QString KDocmlObjectNameNextPushButton = "nextPushButton";
-/** DOCML object name for twoRowsLayout */
-const QString KDocmlObjectNameTwoRowsLayout = "twoRowsLayout";
-/** DOCML object name for firstRowLabel */
-const QString KDocmlObjectNameFirstRowLabel = "firstRowLabel";
-/** DOCML object name for secondRowLabel */
-const QString KDocmlObjectNameSecondRowLabel = "secondRowLabel";
-/** DOCML object name for lonelyRowLabel */
-const QString KDocmlObjectNameLonelyRowLabel = "lonelyRowLabel";
-/** DOCML object name for animationIcon */
-const QString KDocmlObjectNameAnimationIcon = "animationIcon";
-/** Delay which after the widget returns to the state where radio is not running. */
-const int KRadioStartingStateCancelDelay = 10000;
-
-class FmRadioHsWidget : public HbWidget
-{
- Q_OBJECT
- Q_PROPERTY(QString rootPath READ rootPath WRITE setRootPath)
-public:
- FmRadioHsWidget(QGraphicsItem *parent = 0, Qt::WindowFlags flags = 0);
- ~FmRadioHsWidget();
-
-public:
- // Enum for commands controlling FM Radio.
- enum FmRadioControlCommand
- {
- Mute,
- Unmute,
- PreviousChannel,
- NextChannel
- };
-
- // Enum for FM Radio states.
- enum FmRadioState
- {
- Undefined,
- NotRunning,
- Starting,
- Running,
- ControllingAudio,
- NotControllingAudio,
- Seeking,
- AntennaNotConnected,
- Closing
- };
-
- // Enum for information area layout states.
- enum InformationAreaLayout
- {
- OneRow,
- TwoRows,
- Animation
- };
-
- // Enum for control button position.
- enum ControlButtonPosition
- {
- Left,
- Center,
- Right
- };
-
- QString rootPath()const;
- void setRootPath(const QString &rootPath);
-
-public slots:
- void onInitialize();
- void onShow();
- void onHide();
- //void onUninitialize(); // Can be used in future to get on unintialize event.
-
-private slots:
- void load(const QString &docml);
- void closeRadio();
- void previousChannel();
- void nextChannel();
- void radioToForeground();
- void radioToBackground();
-
- void handleRadioInformationChange(const int notificationId,
- const QVariant &value);
- bool updateRadioInformation(const QString &informationType,
- const QString &information);
- void radioInformationChanged();
- void clearRadioInformation();
- void handleRadioStateChange(const QVariant &value);
-
- void changeInformationAreaLayout(const InformationAreaLayout layout);
- void changePowerButtonOn(const bool isPowerOn);
- void changeStationButtonsEnabledState(const bool enabled);
- void changeControlButtonFrameBackground(const bool enabled,
- const ControlButtonPosition position, HbPushButton *button);
-
- void cancelRadioStartingState();
- void stopRadioStartingCancelTimer();
-
-private:
- // Data
- Q_DISABLE_COPY(FmRadioHsWidget)
-
- QString mRootPath;
-
- // UI components.
- HbPushButton *mRadioPushButton;
- HbPushButton *mTunerBackgroundPushButton;
- HbPushButton *mPowerToggleButton;
- HbPushButton *mPreviousPushButton;
- HbPushButton *mNextPushButton;
- QGraphicsWidget *mInformationAreaTwoRowsLayout;
- HbLabel *mInformationFirstRowLabel;
- HbLabel *mInformationSecondRowLabel;
- HbLabel *mInformationLonelyRowLabel;
- HbLabel *mAnimationIcon;
-
- // Stores the state of the FM Radio application.
- FmRadioState mFmRadioState;
- // Stores the presence of favorite stations.
- bool mFavoriteStations;
-
- // Stores the radio information.
- QHash<QString, QString> mRadioInformation;
- QString mRadioInformationFirstRow;
- QString mRadioInformationSecondRow;
-
- // For reading P&S keys.
- FmRadioHsWidgetProfileReader *mProfileMonitor;
-
- // For communicating with the FM Radio through Qt Highway.
- FmRadioHsWidgetRadioServiceClient *mRadioServiceClient;
-
- // For cancelinf the starting state after a delay.
- QTimer *mRadioStartingCancelTimer;
-
-};
-
-#endif // FMRADIOHSWIDGET_H
--- a/hswidgetplugin/fmradiohswidgetplugin/inc/fmradiohswidgetplugin.h Fri Jun 11 13:38:32 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-/*
-* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: FM Radio home screen widget plugin
-*
-*/
-
-#ifndef FMRADIOHSWIDGETPLUGIN_H
-#define FMRADIOHSWIDGETPLUGIN_H
-
-#include <QObject>
-#include <qserviceplugininterface.h>
-
-QTM_USE_NAMESPACE
-class FmRadioHsWidgetPlugin : public QObject, public QServicePluginInterface
-{
- Q_OBJECT
- Q_INTERFACES(QtMobility::QServicePluginInterface)
-
-public:
- QObject *createInstance(const QServiceInterfaceDescriptor &descriptor,
- QServiceContext *context,
- QAbstractSecuritySession *session);
-};
-
-#endif // FMRADIOHSWIDGETPLUGIN_H
--- a/hswidgetplugin/fmradiohswidgetplugin/inc/fmradiohswidgetprofilereader.h Fri Jun 11 13:38:32 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: FM Radio widget profile reader
-*
-*/
-
-#ifndef FMRADIOHSWIDGETPROFILEREADER_H_
-#define FMRADIOHSWIDGETPROFILEREADER_H_
-
-// System includes
-#include <QObject>
-#include <QVariant>
-
-// Forward declarations
-class XQSettingsManager;
-class XQSettingsKey;
-
-class FmRadioHsWidgetProfileReader : public QObject
-{
-Q_OBJECT
-
-public:
- explicit FmRadioHsWidgetProfileReader(QObject *parent = 0);
- virtual ~FmRadioHsWidgetProfileReader();
-
-signals:
- //void profileChanged(int profile);
- void radioRunning(const QVariant &state);
-
-public slots:
- void itemDeleted(const XQSettingsKey &key);
- void handleChanges(const XQSettingsKey &key, const QVariant &value);
- void startMonitoringRadioRunningStatus();
-
-private slots:
- //void currentProfileStatus(const QVariant &value);
- void currentRadioRunningStatus(const QVariant &value);
-
-private: // data
- XQSettingsManager *mSettingsManager; // For getting and P&S notifications
- int mRadioStatus;
-};
-
-#endif /* FMRADIOHSWIDGETPROFILEREADER_H_ */
--- a/hswidgetplugin/fmradiohswidgetplugin/inc/fmradiohswidgetradioserviceclient.h Fri Jun 11 13:38:32 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,114 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: FM Radio widget radio service client
-*
-*/
-
-#ifndef FMRADIOHSWIDGETRADIOSERVICECLIENT_H_
-#define FMRADIOHSWIDGETRADIOSERVICECLIENT_H_
-
-// System includes
-#include <QObject>
-#include <xqservicerequest.h>
-#include <xqappmgr.h>
-
-// Constants
-/** Radio service name. */
-const QString KRadioServiceName = "com.nokia.services.Radio";
-/** Radio control interface name. */
-const QString KRadioServiceControlInterfaceName = "IRadioControl";
-/** Radio control operation name. */
-const QString KRadioServiceControlOperation = "command(int)";
-/** Radio monitor interface name. */
-const QString KRadioServiceMonitorInterfaceName = "IRadioMonitor";
-/** Radio monitor operation name. */
-const QString KRadioServiceMonitorOperation = "requestNotifications()";
-/** Radio refresh operation name. */
-const QString KRadioServiceRefreshOperation = "requestAllData()";
-
-class FmRadioHsWidgetRadioServiceClient : public QObject
-{
-Q_OBJECT
-
-public:
- explicit FmRadioHsWidgetRadioServiceClient(QObject *parent = 0);
- virtual ~FmRadioHsWidgetRadioServiceClient();
-
- // Enum for station changing command.
- enum FmRadioStationChangeCommand
- {
- PreviousFavouriteStation,
- NextFavouriteStation
- };
-
- // Enum for type of radio information.
- enum FmRadioInformationType
- {
- InformationTypeStationName,
- InformationTypeCallSign,
- InformationTypeFrequency,
- InformationTypeRt,
- InformationTypeDynamicPsName,
- InformationTypePty
- };
-
- // Enum for controlling the visibility of the radio application.
- enum FmRadioVisibilty
- {
- DoNotChange,
- ToForeground,
- ToBackground
- };
-
-signals:
- void radioInformationChanged(const int notificationId,
- const QVariant &value);
- void radioStateChanged(const QVariant &value);
-
-public slots:
- void doCloseFmRadio();
- void doPowerOnFmRadio();
- void doChangeFmRadioVisibility(const FmRadioVisibilty visibility);
- void doChangeFmRadioStation(const FmRadioStationChangeCommand command);
- void handleFmRadioInformationChange(const QVariant &value);
- void handleFmRadioStateChange(const QVariant &value);
- void startMonitoring(const FmRadioVisibilty visibility);
- void stopMonitoring();
-
-protected slots:
-
-private slots:
- void handleError(const int errorCode, const QString &errorMessage);
- void handleRequestError(const int error);
-
- void createControlServiceRequest();
- void createMonitorServiceRequest();
-
- void doSendMonitorRequest(const FmRadioVisibilty visibility);
- void doSendControlRequest(const QVariant &argument,
- const FmRadioVisibilty visibility);
-
- void prepareRequestInfo(XQAiwRequest *request,
- const FmRadioVisibilty visibility);
-
-private: // data
- bool mRequestPending;
- XQApplicationManager mApplicationManager;
- XQAiwRequest* mRadioMonitorRequest;
- XQAiwRequest* mRadioControlRequest;
-
- bool mDataInitialized;
-};
-
-#endif /* FMRADIOHSWIDGETRADIOSERVICECLIENT_H_ */
--- a/hswidgetplugin/fmradiohswidgetplugin/locales/compile_ts.bat Fri Jun 11 13:38:32 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-@echo off
-
-set QM_FILE=fmradiohswidgetplugin.qm
-set QM_FILE_EN_US=fmradiohswidgetplugin_en_us.qm
-set QM_LOCATION=./
-
-
-ECHO Creating QM file
-call lrelease -idbased fmradiohswidgetplugin.ts -qm %QM_LOCATION%%QM_FILE%
-REM call lrelease -idbased fmradiohswidgetplugin_en_us.ts -qm %QM_LOCATION%%QM_FILE_EN_US%
Binary file hswidgetplugin/fmradiohswidgetplugin/locales/fmradiohswidgetplugin.qm has changed
--- a/hswidgetplugin/fmradiohswidgetplugin/locales/fmradiohswidgetplugin.ts Fri Jun 11 13:38:32 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,516 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="3.0" sourcelanguage="en_GB">
-<context>
-<message numerus="no" id="txt_rad_info_country_music_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Country Music</source>
- <translation variants="no" type="unfinished"></translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>rad</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_rad_info_social_affairs_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Social Affairs</source>
- <translation variants="no" type="unfinished"></translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>rad</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_rad_info_weather_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Weather</source>
- <translation variants="no" type="unfinished"></translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>rad</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_rad_info_personality_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Personality</source>
- <translation variants="no" type="unfinished"></translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>rad</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_rad_info_soft_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Soft</source>
- <translation variants="no" type="unfinished"></translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>rad</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_rad_info_rhythm_and_blues_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Rhythm and blues</source>
- <translation variants="no" type="unfinished"></translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>rad</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_rad_info_information_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Information</source>
- <translation variants="no" type="unfinished"></translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>rad</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_rad_info_phone_in_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Phone In</source>
- <translation variants="no" type="unfinished"></translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>rad</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_rad_info_current_affairs_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Current affairs</source>
- <translation variants="no" type="unfinished"></translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>rad</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_rad_info_alarm_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Alarm</source>
- <translation variants="no" type="unfinished"></translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>rad</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_rad_info_leisure_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Leisure</source>
- <translation variants="no" type="unfinished"></translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>rad</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_rad_info_childrens_programmes_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Children’s programmes</source>
- <translation variants="no" type="unfinished"></translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>rad</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_rad_info_light_classical_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Light classical</source>
- <translation variants="no" type="unfinished"></translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>rad</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_rad_info_alarm_test_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Alarm Test</source>
- <translation variants="no" type="unfinished"></translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>rad</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_rad_info_religious_talk_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Religious talk</source>
- <translation variants="no" type="unfinished"></translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>rad</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_rad_list_fm_radio">
- <comment>Text in a home screen widget information area. Displayed when no station is tuned.</comment>
- <source>FM Radio</source>
- <translation variants="no" type="unfinished"></translation>
- <extra-loc-layout_id>txt_rad_list_fm_radio</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>list</extra-loc-positionid>
- <extra-loc-feature>rad</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_rad_info_news_hs">
- <comment>Displayed in FM Radio home screen widget's information area. Custom layout parent string.</comment>
- <source>News</source>
- <translation variants="no" type="unfinished"></translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>rad</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_rad_info_easy_listening_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Easy Listening</source>
- <translation variants="no" type="unfinished"></translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>rad</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_rad_info_top_40_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Top 40</source>
- <translation variants="no" type="unfinished"></translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>rad</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_rad_info_public_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Public</source>
- <translation variants="no" type="unfinished"></translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>rad</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_rad_info_varied_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Varied</source>
- <translation variants="no" type="unfinished"></translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>rad</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_rad_info_nostalgia_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Nostalgia</source>
- <translation variants="no" type="unfinished"></translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>rad</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_rad_info_classical_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Classical</source>
- <translation variants="no" type="unfinished"></translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>rad</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_rad_info_national_music_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>National Music</source>
- <translation variants="no" type="unfinished"></translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>rad</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_rad_info_science_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Science</source>
- <translation variants="no" type="unfinished"></translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>rad</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_rad_info_jazz_music_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Jazz Music</source>
- <translation variants="no" type="unfinished"></translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>rad</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_rad_info_religious_music_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Religious music</source>
- <translation variants="no" type="unfinished"></translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>rad</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_rad_info_other_music_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Other Music</source>
- <translation variants="no" type="unfinished"></translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>rad</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_rad_info_folk_music_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Folk Music</source>
- <translation variants="no" type="unfinished"></translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>rad</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_rad_info_religion_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Religion</source>
- <translation variants="no" type="unfinished"></translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>rad</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_rad_info_soft_rock_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Soft rock</source>
- <translation variants="no" type="unfinished"></translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>rad</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_rad_info_adult_hits_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Adult hits</source>
- <translation variants="no" type="unfinished"></translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>rad</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_rad_info_drama_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Drama</source>
- <translation variants="no" type="unfinished"></translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>rad</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_rad_info_rock_music_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Rock Music</source>
- <translation variants="no" type="unfinished"></translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>rad</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_rad_info_serious_classical_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Serious classical</source>
- <translation variants="no" type="unfinished"></translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>rad</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_rad_info_college_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>College</source>
- <translation variants="no" type="unfinished"></translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>rad</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_rad_info_connect_wired_headset">
- <comment>Notification text which is displayed in home screen widget, when the headset antenna is not connected.</comment>
- <source>Connect wired headset.</source>
- <translation variants="no" type="unfinished"></translation>
- <extra-loc-layout_id>txt_rad_info_news</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>rad</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_rad_info_oldies_music_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Oldies Music</source>
- <translation variants="no" type="unfinished"></translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>rad</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_rad_info_documentary_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Documentary</source>
- <translation variants="no" type="unfinished"></translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>rad</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_rad_info_education_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Education</source>
- <translation variants="no" type="unfinished"></translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>rad</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_rad_info_sport_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Sport</source>
- <translation variants="no" type="unfinished"></translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>rad</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_rad_info_pop_music_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Pop Music</source>
- <translation variants="no" type="unfinished"></translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>rad</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_rad_info_language_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Language</source>
- <translation variants="no" type="unfinished"></translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>rad</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_rad_info_classic_rock_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Classic rock</source>
- <translation variants="no" type="unfinished"></translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>rad</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_rad_list_l1_mhz">
- <comment>Text in a home screen widget information area. %L1 is the radio station's frequency.</comment>
- <source>%L1 Mhz</source>
- <translation variants="no" type="unfinished"></translation>
- <extra-loc-layout_id>txt_rad_list_l1_mhz</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>list</extra-loc-positionid>
- <extra-loc-feature>rad</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_rad_info_soft_rhythm_and_blues_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Soft rhythm and blues</source>
- <translation variants="no" type="unfinished"></translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>rad</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_rad_info_culture_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Culture</source>
- <translation variants="no" type="unfinished"></translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>rad</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_rad_info_talk_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Talk</source>
- <translation variants="no" type="unfinished"></translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>rad</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_rad_info_finance_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Finance</source>
- <translation variants="no" type="unfinished"></translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>rad</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_rad_info_activate_radio_in_offline_mode_hs">
- <comment>Confirmation query which is displayed when the FM Radio is launched from the FM Radio home screen widget while the device is in offline mode. (Note that same text is also in FM radio textmap.)</comment>
- <source>Activate Fm Radio in off-line mode?</source>
- <translation variants="no" type="unfinished"></translation>
- <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>rad</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_rad_info_travel_hs">
- <comment>Displayed in FM Radio home screen widget's information area.</comment>
- <source>Travel</source>
- <translation variants="no" type="unfinished"></translation>
- <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
- <extra-loc-viewid>rad_05</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>rad</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-</context>
-</TS>
--- a/hswidgetplugin/fmradiohswidgetplugin/qmakepluginstubs/fmradiohswidgetplugin.qtplugin Fri Jun 11 13:38:32 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-This file is a Qt plugin stub file. The real Qt plugin is located in /sys/bin. Created:2010-05-05T10:52:10
--- a/hswidgetplugin/fmradiohswidgetplugin/resource/fmradiohswidget.docml Fri Jun 11 13:38:32 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<hbdocument version="1.0">
- <widget name="mainLayout" type="HbWidget">
- <widget name="controlButtons" type="HbWidget">
- <widget name="powerToggleButton" type="HbPushButton">
- <bool name="checkable" value="TRUE"/>
- <string name="text"/>
- </widget>
- <widget name="previousPushButton" type="HbPushButton">
- <icon iconName="qtg_mono_previous" name="icon"/>
- <string name="text"/>
- </widget>
- <widget name="nextPushButton" type="HbPushButton">
- <icon iconName="qtg_mono_next" name="icon"/>
- <string name="text"/>
- </widget>
- <real name="z" value="0"/>
- <sizepolicy horizontalPolicy="Preferred" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
- <sizehint height="8un" type="PREFERRED" width="32un"/>
- <sizehint height="8un" type="MINIMUM" width="32un"/>
- <layout orientation="Horizontal" spacing="0un" type="linear">
- <contentsmargins bottom="0un" left="0un" right="0un" top="0un"/>
- <linearitem itemname="powerToggleButton"/>
- <linearitem itemname="previousPushButton"/>
- <linearitem itemname="nextPushButton"/>
- </layout>
- </widget>
- <widget name="tunerStackedLayout" type="HbWidget">
- <widget name="tunerInformationStackedLayout" type="HbWidget">
- <widget name="lonelyRowLabel" type="HbLabel">
- <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
- <sizehint type="PREFERRED" width="expr(32un - 2 * var(hb-param-margin-gene-middle-horizontal) )"/>
- <string name="plainText"/>
- <fontspec name="fontSpec" role="Primary" textheight="var(hb-param-text-height-tiny)"/>
- </widget>
- <widget name="twoRowsLayout" type="HbWidget">
- <widget name="firstRowLabel" type="HbLabel">
- <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
- <real name="z" value="1"/>
- <sizehint type="PREFERRED" width="expr(32un - 2 * var(hb-param-margin-gene-middle-horizontal) )"/>
- <string name="plainText"/>
- <fontspec name="fontSpec" role="Primary" textheight="var(hb-param-text-height-tiny)"/>
- </widget>
- <widget name="secondRowLabel" type="HbLabel">
- <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
- <real name="z" value="2"/>
- <sizehint type="PREFERRED" width="expr(32un - 2 * var(hb-param-margin-gene-middle-horizontal) )"/>
- <string name="plainText"/>
- <fontspec name="fontSpec" role="Primary" textheight="var(hb-param-text-height-tiny)"/>
- </widget>
- <real name="z" value="3"/>
- <sizehint height="expr(10un - 2 * 1.5un )" type="PREFERRED" width="expr(32un - 2 * var(hb-param-margin-gene-middle-horizontal) )"/>
- <layout orientation="Vertical" spacing="var(hb-param-margin-gene-middle-vertical)" type="linear">
- <contentsmargins bottom="0un" left="0un" right="0un" top="0un"/>
- <linearitem itemname="firstRowLabel"/>
- <linearitem itemname="secondRowLabel"/>
- </layout>
- </widget>
- <widget name="animationIcon" type="HbLabel">
- <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
- <icon iconName="qtg_anim_loading_1" name="icon"/>
- <sizehint height="var(hb-param-graphic-size-primary-medium)" type="PREFERRED" width="var(hb-param-graphic-size-primary-medium)"/>
- </widget>
- <real name="z" value="1"/>
- <sizepolicy horizontalPolicy="Preferred" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
- <sizehint height="7un" type="PREFERRED" width="30.5un"/>
- <sizehint height="expr(10un - 2 * 1.5un)" type="MINIMUM" width="expr(32un - 4 * var(hb-param-margin-gene-middle-horizontal))"/>
- <contentsmargins bottom="1.5un" left="var(hb-param-margin-gene-middle-horizontal)" right="var(hb-param-margin-gene-middle-horizontal)" top="1.5un"/>
- <sizehint height="2504062.01158un" type="MAXIMUM" width="2504062.01158un"/>
- <layout type="stacked">
- <stackitem itemname="lonelyRowLabel"/>
- <stackitem itemname="twoRowsLayout"/>
- <stackitem itemname="animationIcon"/>
- </layout>
- </widget>
- <widget name="tunerBackgroundPushButton" type="HbPushButton">
- <sizehint height="10un" type="PREFERRED" width="32un"/>
- <sizehint type="MINIMUM" width="32un"/>
- <string name="text"/>
- <string name="state" value="normal"/>
- </widget>
- <real name="z" value="0"/>
- <sizehint height="10un" type="PREFERRED" width="32un"/>
- <sizehint height="10un" type="MINIMUM" width="32un"/>
- <contentsmargins bottom="0un" left="0un" right="0un" top="0un"/>
- <layout type="stacked">
- <stackitem itemname="tunerInformationStackedLayout"/>
- <stackitem itemname="tunerBackgroundPushButton"/>
- </layout>
- </widget>
- <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
- <sizehint height="26.5un" type="FIXED" width="37un"/>
- <sizehint height="26.5un" type="MINIMUM"/>
- <sizehint height="26.5un" type="MAXIMUM" width="37un"/>
- <layout orientation="Vertical" spacing="0un" type="linear">
- <contentsmargins bottom="2un" left="2.5un" right="2.5un" top="5.5un"/>
- <linearitem itemname="tunerStackedLayout" spacing="var(hb-param-margin-gene-middle-vertical)"/>
- <linearitem itemname="controlButtons" spacing="0un"/>
- </layout>
- </widget>
- <metadata activeUIState="Common ui state" display="NHD landscape" unit="un">
- <uistate name="Common ui state" sections="#common"/>
- </metadata>
-</hbdocument>
--- a/hswidgetplugin/fmradiohswidgetplugin/resource/fmradiohswidgetplugin.css Fri Jun 11 13:38:32 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-HbMarqueeItem#marquee1::text {
- text-height: var(hb-param-text-height-tiny);
- font-variant: secondary;
- color: qtc_hs_list_item_title;
- text-align: center center;
- text-wrap-mode: no-wrap;
-}
-
-HbMarqueeItem#marquee2::text {
- text-height: var(hb-param-text-height-tiny);
- font-variant: secondary;
- color: qtc_hs_list_item_content;
- text-align: center center;
- text-wrap-mode: no-wrap;
-}
-
-HbMarqueeItem#marquee3::text {
- text-height: var(hb-param-text-height-tiny);
- font-variant: secondary;
- color: red;
- text-align: center center;
- text-wrap-mode: no-wrap;
-}
-
-HbPushButton#tunerBackgroundPushButton::text,
-HbPushButton[state = "normal"]#tunerBackgroundPushButton::text {
- color: grey;
- text-align: left bottom;
-}
-
-HbPushButton[state = "normal"]#tunerBackgroundPushButton::background {
- border-width: 1un;
-}
-
-HbPushButton[state = "highlight"]#tunerBackgroundPushButton::text {
- color: yellow;
- text-align: right top;
-}
-
-HbPushButton[state = "pressed"]#tunerBackgroundPushButton::text {
- color: red;
- text-align: center center;
-}
-
-HbPushButton[state = "normal"]#tunerBackgroundPushButton::background {
- frame-graphics-name: "qtg_fr_tuner";
- frame-graphics-type: ThreePiecesHorizontal;
-}
-
-HbPushButton[state = "pressed"]#tunerBackgroundPushButton::background {
- frame-graphics-name: "qtg_fr_hsitems2_pressed";
- frame-graphics-type: NinePieces;
-}
-
-
-HbPushButton[state = "latched"]#tunerBackgroundPushButton::text {
- color: green;
- text-align: top center;
-}
-
-HbPushButton[state = "latched"]#tunerBackgroundPushButton::background {
- border-width: 0un;
-}
-
-HbPushButton[state = "disabled"]#tunerBackgroundPushButton::text {
- color: brown;
- text-align: right bottom;
-}
--- a/hswidgetplugin/fmradiohswidgetplugin/resource/fmradiohswidgetplugin.manifest Fri Jun 11 13:38:32 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<widgetprovider>
- <widget library="fmradiohswidgetplugin"
- uri="fmradiohswidgetplugin"
- title="#FM Radio Widget"
- iconuri="fmradiohswidgetplugin_icon.png"
- description="FM Radio homescreen widget."/>
-</widgetprovider>
--- a/hswidgetplugin/fmradiohswidgetplugin/resource/fmradiohswidgetplugin.s60xml Fri Jun 11 13:38:32 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<service>
- <name>fmradiohswidgetplugin</name>
- <filepath>c:/private/20022F35/import/widgetregistry/2002E6D6/fmradiohswidgetplugin.qtplugin</filepath>
- <description>FM Radio homescreen widget</description>
- <interface>
- <name>com.nokia.IHomeScreenWidget</name>
- <version>1.0</version>
- <description>FM Radio homescreen widget</description>
- <capabilities></capabilities>
- <customproperty key="iconuri">fmradiohswidgetplugin_icon.png</customproperty>
- <customproperty key="title">FM Radio Widget</customproperty>
- </interface>
-</service>
--- a/hswidgetplugin/fmradiohswidgetplugin/resource/fmradiohswidgetplugin.xml Fri Jun 11 13:38:32 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<service>
- <name>fmradiohswidgetplugin</name>
- <filepath>fmradiohswidgetplugin</filepath>
- <description>FM Radio homescreen widget</description>
- <interface>
- <name>com.nokia.symbian.IHomeScreenWidget</name>
- <version>1.0</version>
- <description>FM Radio homescreen widget</description>
- <capabilities></capabilities>
- <customproperty key="iconuri">fmradiohswidgetplugin_icon.png</customproperty>
- <customproperty key="title">FM Radio Widget</customproperty>
- </interface>
-</service>
Binary file hswidgetplugin/fmradiohswidgetplugin/resource/fmradiohswidgetplugin_icon.png has changed
Binary file hswidgetplugin/fmradiohswidgetplugin/resource/mono_power.png has changed
Binary file hswidgetplugin/fmradiohswidgetplugin/resource/qtg_graf_hsradio_bg.png has changed
--- a/hswidgetplugin/fmradiohswidgetplugin/resources.qrc Fri Jun 11 13:38:32 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-<RCC>
- <qresource prefix="/ui">
- <file>resource/fmradiohswidget.docml</file>
- <file>resource/fmradiohswidgetplugin.css</file>
- <file>resource/mono_power.png</file>
- <file>resource/qtg_graf_hsradio_bg.png</file>
- </qresource>
-</RCC>
--- a/hswidgetplugin/fmradiohswidgetplugin/src/fmradiohswidget.cpp Fri Jun 11 13:38:32 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,937 +0,0 @@
-/*
-* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: FM Radio home screen widget
-*
-*/
-
-// System includes
-#include <HbPushButton>
-#include <HbLabel>
-#include <HbDocumentLoader>
-#include <HbFrameDrawer>
-#include <HbFrameItem>
-#include <HbIcon>
-#include <HbIconAnimationManager>
-#include <HbIconAnimationDefinition>
-#include <HbColorScheme>
-#include <QGraphicsLinearLayout>
-#include <QGraphicsItem>
-#include <QDesktopServices>
-#include <QTimer>
-
-// User includes
-#include "fmradiohswidget.h"
-#include "fmradiohswidgetprofilereader.h"
-#include "fmradiohswidgetradioserviceclient.h"
-#include "radioservicedef.h"
-#include "radio_global.h"
-#include "radiologger.h"
-
-/*!
- \ingroup group_fmradiohs_widget
- \class FmRadioHsWidget
- \brief Example implementation for home screen widget.
-
- FmRadioHsWidget implements needed functions for the FM Radio home screen
- widget.
-*/
-
-// ======== MEMBER FUNCTIONS ========
-
-/*!
- Constructs a widget which is a child of \a parent, with widget flags set to \a flags.
-
- Constructor should be empty and all the actual construction should be
- done in onInitialize().
-*/
-FmRadioHsWidget::FmRadioHsWidget(QGraphicsItem* parent, Qt::WindowFlags flags)
- : HbWidget(parent, flags),
- mTunerBackgroundPushButton(NULL),
- mPowerToggleButton(NULL),
- mPreviousPushButton(NULL),
- mNextPushButton(NULL),
- mInformationFirstRowLabel(NULL),
- mInformationSecondRowLabel(NULL),
- mFmRadioState(Undefined),
- mFavoriteStations(false),
- mRadioInformation(QHash<QString, QString>()),
- mProfileMonitor(NULL),
- mRadioServiceClient(NULL),
- mRadioStartingCancelTimer(NULL)
-{
- LOG_METHOD_ENTER;
-}
-
-/*!
- Destructor
-*/
-FmRadioHsWidget::~FmRadioHsWidget()
-{
- LOG_METHOD;
-}
-
-/*!
- Getter for /r mRootPath property.
-*/
-QString FmRadioHsWidget::rootPath()const
-{
- LOG_METHOD_ENTER;
- return mRootPath;
-}
-
-/*!
- Sets the mRoothPath propertry to /a roothPath.
-*/
-void FmRadioHsWidget::setRootPath(const QString &rootPath)
-{
- LOG_METHOD_ENTER;
- mRootPath = rootPath;
-}
-
-/*!
- Called when widget is initialized. Constructs objects and connects them.
-*/
-void FmRadioHsWidget::onInitialize()
-{
- LOG_METHOD_ENTER;
- mProfileMonitor = new FmRadioHsWidgetProfileReader(this);
- mRadioServiceClient = new FmRadioHsWidgetRadioServiceClient(this);
- mRadioStartingCancelTimer = new QTimer(this);
-
- connect(mRadioServiceClient, SIGNAL(radioInformationChanged(int, QVariant)), this,
- SLOT(handleRadioInformationChange(int, QVariant)));
- connect(mRadioServiceClient, SIGNAL(radioStateChanged(QVariant)), this,
- SLOT(handleRadioStateChange(QVariant)));
- connect(mProfileMonitor, SIGNAL(radioRunning(QVariant)), this,
- SLOT(handleRadioStateChange(QVariant)));
-
- load(KDocml);
-
- mProfileMonitor->startMonitoringRadioRunningStatus();
-}
-
-/*!
- Called when widget is shown in the home screen
-*/
-void FmRadioHsWidget::onShow()
-{
- LOG_METHOD_ENTER;
-}
-
-/*!
- Called when widget is hidden from the home screen
-*/
-void FmRadioHsWidget::onHide()
-{
- LOG_METHOD_ENTER;
-}
-
-/*!
- Loads docml files.
-*/
-void FmRadioHsWidget::load(const QString &docml)
-{
- LOG_METHOD_ENTER;
-
- HbDocumentLoader *documentLoader = new HbDocumentLoader();
- documentLoader->reset();
- bool loaded = false;
- documentLoader->load(docml, &loaded);
-
- if (loaded) {
- // Find mainLayout
- HbWidget *mainLayout = qobject_cast<HbWidget*> (documentLoader->findWidget(
- KDocmlObjectNameMainLayout));
- // For drawing frame backgrounds
- HbFrameItem *frameItem = NULL;
-
- if (mainLayout) {
- QGraphicsLinearLayout *mWidgetLayout = new QGraphicsLinearLayout(Qt::Vertical, this);
-
- // Temporarily use graphics from resources. Change to the system
- // graphics when they are available.
- HbFrameDrawer *drawer = new HbFrameDrawer(
- ":/ui/resource/qtg_graf_hsradio_bg.png",
- HbFrameDrawer::OnePiece);
- //HbFrameDrawer *drawer = new HbFrameDrawer("qtg_fr_hswidget_normal",
- // HbFrameDrawer::NinePieces);
- frameItem = new HbFrameItem(drawer, mainLayout);
- frameItem->setPreferredSize(mainLayout->preferredSize());
-
- mWidgetLayout->addItem(mainLayout);
- setLayout(mWidgetLayout);
- }
-
- // Find stacked layout for tuner area.
- HbWidget *tunerStackedLayout = qobject_cast<HbWidget*> (documentLoader->findWidget(
- KDocmlObjectNameTunerStackedLayout));
- if (tunerStackedLayout) {
-
- // Find stacked layout for information area.
- HbWidget *tunerInformationStackedLayout = qobject_cast<HbWidget*> (documentLoader->findWidget(
- KDocmlObjectNameTunerInformationStackedLayout));
- if (tunerInformationStackedLayout) {
-
- // MarqueeItem tests.
- /*
- QGraphicsLinearLayout *layout = new QGraphicsLinearLayout(Qt::Vertical, mInformationAreaOneRowLayout);
- mInformationLonelyRowMarquee = new HbMarqueeItem();
- mInformationLonelyRowMarquee->setObjectName("marquee3");
- HbStyle::setItemName(mInformationLonelyRowMarquee, "marquee3");
- mInformationLonelyRowMarquee->setText(
- "Long text");
- mInformationLonelyRowMarquee->setLoopCount(-1);
- mInformationLonelyRowMarquee->startAnimation();
- HbFontSpec fs(HbFontSpec::Secondary);
- mInformationLonelyRowMarquee->setFontSpec(fs);
- mInformationLonelyRowMarquee->setTextColor(HbColorScheme::color("qtc_hs_list_item_title"));
- mInformationLonelyRowMarquee->setPreferredSize(layout->preferredSize());
- layout->addItem(mInformationLonelyRowMarquee);
- */
- /*
- }
- */
-
- // Find lonely label
- mInformationLonelyRowLabel = qobject_cast<HbLabel *> (documentLoader->findWidget(
- KDocmlObjectNameLonelyRowLabel));
- if (mInformationLonelyRowLabel) {
- QColor color = HbColorScheme::color("qtc_radio_tuner_normal");
- if (color.isValid()) {
- mInformationLonelyRowLabel->setTextColor(color);
- }
- }
-
- // Find layout for two rows
- mInformationAreaTwoRowsLayout = qobject_cast<QGraphicsWidget *> (
- documentLoader->findObject(KDocmlObjectNameTwoRowsLayout));
- if (mInformationAreaTwoRowsLayout) {
- // Find first row
- mInformationFirstRowLabel = qobject_cast<HbLabel *> (documentLoader->findWidget(
- KDocmlObjectNameFirstRowLabel));
- if (mInformationFirstRowLabel) {
- QColor color = HbColorScheme::color("qtc_radio_tuner_normal");
- if (color.isValid()) {
- mInformationFirstRowLabel->setTextColor(color);
- }
- }
-
- // Find second row
- mInformationSecondRowLabel = qobject_cast<HbLabel *> (documentLoader->findWidget(
- KDocmlObjectNameSecondRowLabel));
- if (mInformationSecondRowLabel) {
- QColor color = HbColorScheme::color("qtc_radio_tuner_normal");
- if (color.isValid()) {
- mInformationSecondRowLabel->setTextColor(color);
- }
- }
-
- }
-
-
- mAnimationIcon = qobject_cast<HbLabel *> (documentLoader->findWidget(
- KDocmlObjectNameAnimationIcon));
- if (mAnimationIcon) {
- // Use animation manager to define the frame-by-frame animation.
- HbIconAnimationManager *animationManager = HbIconAnimationManager::global();
-
- // Create animation definition.
- HbIconAnimationDefinition animationDefinition;
- QList<HbIconAnimationDefinition::AnimationFrame> animationFrameList;
-
- // This should be probably done by loading axml instead.
- HbIconAnimationDefinition::AnimationFrame animationFrame;
- QString animationFrameIconName;
- QString animationFrameIconNamePrefix = "qtg_anim_loading_";
- for (int i = 1; i < 11; i++) {
- animationFrame.duration = 100;
- animationFrameIconName.clear();
- animationFrameIconName.append(animationFrameIconNamePrefix);
- animationFrameIconName.append(animationFrameIconName.number(i));
- animationFrame.iconName = animationFrameIconName;
- animationFrameList.append(animationFrame);
- }
- animationDefinition.setPlayMode(HbIconAnimationDefinition::Loop);
- animationDefinition.setFrameList(animationFrameList);
- animationManager->addDefinition("animation", animationDefinition);
-
- // Construct an icon using the animation definition.
- HbIcon icon("animation");
-
- mAnimationIcon->setIcon(icon);
- }
-
- }
-
- // Find push button for tuner area.
- mTunerBackgroundPushButton = qobject_cast<HbPushButton*> (documentLoader->findWidget(
- KDocmlObjectNameTunerBackgroundPushButton));
- if (mTunerBackgroundPushButton) {
- // Test different states.
- //bool p = mTunerBackgroundPushButton->setProperty("state", "normal");
- // Try css for controlling the appearance.
- //bool b = QFile::exists(KCss);
- //bool cssLoaded = HbStyleLoader::registerFilePath(KCss);
- //HbStyle::setItemName(mTunerBackgroundPushButton, KDocmlObjectNameTunerBackgroundPushButton);
- // Use the frame background.
- HbFrameDrawer *tunerBackgroundButtonFrameDrawer = new HbFrameDrawer(
- "qtg_fr_tuner", HbFrameDrawer::ThreePiecesHorizontal);
- tunerBackgroundButtonFrameDrawer->setFillWholeRect(true);
- mTunerBackgroundPushButton->setFrameBackground(tunerBackgroundButtonFrameDrawer);
-
- // Connect the button's clicked signal.
- connect(mTunerBackgroundPushButton, SIGNAL(clicked()), this, SLOT(radioToForeground()));
- }
-
- }
-
- // Find layout for control buttons.
- HbWidget *controlButtonsLayout = qobject_cast<HbWidget*> (documentLoader->findWidget(
- KDocmlObjectNameContolButtonsLayout));
- if (controlButtonsLayout) {
- if (frameItem) {
- // Stack widget's background behind it.
- frameItem->stackBefore(controlButtonsLayout);
- }
-
- // Find power button.
- mPowerToggleButton = qobject_cast<HbPushButton *> (documentLoader->findWidget(
- KDocmlObjectNameowerToggleButton));
- if (mPowerToggleButton) {
- // If power button is lathced type, use this.
- //mPowerToggleButton->setCheckable(true);
- changeControlButtonFrameBackground(false, Left, mPowerToggleButton);
-
- // Use the graphics from resources until release contains proper graphics.
- mPowerToggleButton->setIcon(HbIcon(":/ui/resource/mono_power.png"));
- // Connect the button's clicked signal.
- connect(mPowerToggleButton, SIGNAL(clicked()), this, SLOT(radioToBackground()));
- }
-
- // Find previous button.
- mPreviousPushButton = qobject_cast<HbPushButton *> (documentLoader->findWidget(
- KDocmlObjectNamePreviousPushButton));
- if (mPreviousPushButton) {
- changeControlButtonFrameBackground(false, Center, mPreviousPushButton);
- // Connect the button's clicked signal.
- connect(mPreviousPushButton, SIGNAL(clicked()), this, SLOT(previousChannel()));
- }
-
- // Find next button.
- mNextPushButton = qobject_cast<HbPushButton *> (documentLoader->findWidget(
- KDocmlObjectNameNextPushButton));
- if (mNextPushButton) {
- changeControlButtonFrameBackground(false, Right, mNextPushButton);
- // Connect the button's clicked signal.
- connect(mNextPushButton, SIGNAL(clicked()), this, SLOT(nextChannel()));
- }
- }
-
- }
- // Loader is not needed anymore so it is deleted.
- delete documentLoader;
-}
-
-/*!
- Slot for closing FM Radio application from power button.
- */
-void FmRadioHsWidget::closeRadio()
-{
- LOG_SLOT_CALLER;
- mRadioServiceClient->doCloseFmRadio();
-}
-
-/*!
- Slot for previous button clicked.
- */
-void FmRadioHsWidget::previousChannel()
-{
- LOG_SLOT_CALLER;
- clearRadioInformation();
- mRadioServiceClient->doChangeFmRadioStation(FmRadioHsWidgetRadioServiceClient::PreviousFavouriteStation);
-}
-
-/*!
- Slot for next button clicked.
- */
-void FmRadioHsWidget::nextChannel()
-{
- LOG_SLOT_CALLER;
- clearRadioInformation();
- mRadioServiceClient->doChangeFmRadioStation(FmRadioHsWidgetRadioServiceClient::NextFavouriteStation);
-}
-
-/*!
- Slot for bringing the radio application to foreground.
- */
-void FmRadioHsWidget::radioToForeground()
-{
- LOG_SLOT_CALLER;
- // If radio is not running start it to foreground by monitor request.
- if (mFmRadioState == NotRunning) {
- handleRadioStateChange(QVariant(Starting));
- //mRadioServiceClient->doPowerOnFmRadio(FmRadioHsWidgetRadioServiceClient::ToForeground);
- mRadioServiceClient->startMonitoring(FmRadioHsWidgetRadioServiceClient::ToForeground);
- }
- else {
- if (mFmRadioState == Closing) {
- // Radio is closing but user wants to power it up again.
- mRadioServiceClient->doPowerOnFmRadio();
- mRadioServiceClient->stopMonitoring();
- mRadioServiceClient->startMonitoring(FmRadioHsWidgetRadioServiceClient::ToBackground);
- handleRadioStateChange(QVariant(Running));
- }
- // If radio is running, bring it to the foreground.
- mRadioServiceClient->doChangeFmRadioVisibility(
- FmRadioHsWidgetRadioServiceClient::ToForeground);
- }
-}
-
-/*!
- Slot for putting the radio application to the background.
- */
-void FmRadioHsWidget::radioToBackground()
-{
- LOG_SLOT_CALLER;
- // If radio is not running start it to background by monitor request.
- if (mFmRadioState == NotRunning) {
- handleRadioStateChange(QVariant(Starting));
- mRadioServiceClient->startMonitoring(FmRadioHsWidgetRadioServiceClient::ToBackground);
- }
- else if (mFmRadioState == Starting) {
- // Do nothing if radio is starting.
- }
- else if (mFmRadioState == Closing) {
- // Radio is closing but user wants to power it up again.
- mRadioServiceClient->doPowerOnFmRadio();
- mRadioServiceClient->stopMonitoring();
- mRadioServiceClient->startMonitoring(FmRadioHsWidgetRadioServiceClient::ToBackground);
- handleRadioStateChange(QVariant(Running));
- }
- else {
- // If radio is running, put it to the background.
- // This is little bit useless because the radio is in background if
- // user is able to click the widget.
- mRadioServiceClient->doChangeFmRadioVisibility(
- FmRadioHsWidgetRadioServiceClient::ToBackground);
- }
-}
-
-/*!
- Handles changes in FM Radio information.
-
- /param type Type of changed information.
- /param value Information content.
- */
-void FmRadioHsWidget::handleRadioInformationChange(const int notificationId,
- const QVariant &value)
-{
- LOG_METHOD;
- LEVEL2(LOG_SLOT_CALLER);
- if (!value.isValid()) {
- // Value is not valid so return.
- return;
- }
- switch ( notificationId ) {
-
- case RadioServiceNotification::FavoriteCount:
- LEVEL2(LOG("FavoriteCount"));
- if (value.canConvert(QVariant::Int)) {
- int favoriteCount = value.toInt();
- // If there are favorite stations, enable the next/previous
- // buttons.
- mFavoriteStations = favoriteCount > 0 ? true : false;
- LEVEL2(LOG_FORMAT("favoriteCount: %d, mFavoriteStations: %d",
- favoriteCount, mFavoriteStations));
- changeStationButtonsEnabledState(mFavoriteStations);
- }
- break;
-
- case RadioServiceNotification::CurrentIsFavorite:
- LEVEL2(LOG("CurrentIsFavorite"));
- if (value.canConvert(QVariant::Bool)) {
- bool currentIsFavorite = value.toBool();
- LEVEL2(LOG_FORMAT("currentIsFavorite: %d", currentIsFavorite));
- // If favorite count is 1 and current station is favorite
- // disable next/prev buttons.
- if (currentIsFavorite) {
- changeStationButtonsEnabledState(false);
- } else {
- // Else eneble them.
- changeStationButtonsEnabledState(true);
- }
- }
- break;
-
- case RadioServiceNotification::RadioStatus:
- LEVEL2(LOG("RadioStatus"));
- if (value.canConvert(QVariant::Int)) {
- int status = value.toInt();
- switch (status) {
- case RadioStatus::Playing:
- LEVEL2(LOG("Playing"));
- handleRadioStateChange(QVariant(ControllingAudio));
- break;
- case RadioStatus::Muted:
- LEVEL2(LOG("Muted"));
- handleRadioStateChange(QVariant(NotControllingAudio));
- break;
- case RadioStatus::Seeking:
- LEVEL2(LOG("Seeking"));
- handleRadioStateChange(QVariant(Seeking));
- break;
- case RadioStatus::NoAntenna:
- LEVEL2(LOG("NoAntenna"));
- handleRadioStateChange(QVariant(AntennaNotConnected));
- break;
- case RadioStatus::PoweringOff:
- LEVEL2(LOG("PoweringOff"));
- handleRadioStateChange(QVariant(Closing));
- break;
- default:
- LEVEL2(LOG("default"));
- break;
- }
- }
- break;
-
- case RadioServiceNotification::Frequency:
- LEVEL2(LOG("Frequency"));
- if (value.canConvert(QVariant::UInt)) {
- const uint frequency = value.toUInt();
- QString frequencyString;
- // Format the frequency to human readable text.
- frequencyString.sprintf("%.1f", qreal(frequency) / FREQUENCY_MULTIPLIER);
- LEVEL2(LOG_FORMAT("frequency: %s", GETSTRING(frequencyString)));
- // TODO: Remove comment when localisation is working on device.
- //frequencyString = hbTrId("txt_rad_list_l1_mhz").arg(freqString);
- bool frequencyCleared = false;
- // If widget has some frequency information and new frequency
- // differs from that
- if (mRadioInformation.contains(KRadioInformationFrequency)
- && mRadioInformation[KRadioInformationFrequency].compare(frequencyString) != 0) {
- // Clear all infromation from widget because station has changed.
- clearRadioInformation();
- frequencyCleared = true;
- }
- // If widget do not have any frquency information, update it.
- bool frequencyUpdated = updateRadioInformation(KRadioInformationFrequency, frequencyString);
- if (frequencyCleared || frequencyUpdated) {
- // Information changed, update the UI.
- radioInformationChanged();
- }
- }
- break;
-
- case RadioServiceNotification::Name:
- LEVEL2(LOG("Name"));
- if (value.canConvert(QVariant::String)) {
- if (updateRadioInformation(KRadioInformationStationName, value.toString())) {
- LEVEL2(LOG_FORMAT("name: %s", GETSTRING(value.toString())));
- radioInformationChanged();
- }
- }
- break;
-
- case RadioServiceNotification::Genre:
- LEVEL2(LOG("Genre"));
- if (value.canConvert(QVariant::String)) {
- if (updateRadioInformation(KRadioInformationPty, value.toString())) {
- LEVEL2(LOG_FORMAT("genre: %s", GETSTRING(value.toString())));
- radioInformationChanged();
- }
- }
- break;
-
- case RadioServiceNotification::RadioText:
- LEVEL2(LOG("RadioText"));
- if (value.canConvert(QVariant::String)) {
- if (updateRadioInformation(KRadioInformationRt, value.toString())) {
- LEVEL2(LOG_FORMAT("radio text: %s", GETSTRING(value.toString())));
- radioInformationChanged();
- }
- }
- break;
-
- case RadioServiceNotification::DynamicPS:
- LOG("DynamicPS");
- if (value.canConvert(QVariant::String)) {
- if (updateRadioInformation(KRadioInformationDynamicPsName, value.toString())) {
- LEVEL2(LOG_FORMAT("dynamicPS: %s", GETSTRING(value.toString())));
- radioInformationChanged();
- }
- }
- break;
-
- default:
- LOG("default");
- break;
- }
-}
-
-/*!
- Check if the the radio information is changed. If it is changed update it.
-
- /param informationType Type of the information.
- /param information Information text.
-
- /return bool If information is updated, return true. Return false otherwise.
- */
-bool FmRadioHsWidget::updateRadioInformation(const QString &informationType,
- const QString &information)
-{
- LOG_METHOD_RET("%d");
- // If hash contains this type of information.
- if (mRadioInformation.contains(informationType)) {
- // If new information is empty.
- if (information.isEmpty()) {
- // Remove old information from the hash.
- LEVEL2(LOG_FORMAT("informationType: %s removed", GETSTRING(informationType)));
- mRadioInformation.remove(informationType);
- // Return true to indicate the change.
- return true;
- }
- // If new information differs from the old one.
- if (mRadioInformation[informationType].compare(information) != 0) {
- // Update the information.
- LEVEL2(LOG_FORMAT("informationType: %s = %s", GETSTRING(informationType), GETSTRING(information)));
- mRadioInformation[informationType] = information;
- // And return true to indicate the change.
- return true;
- }
- } else { // Hash do not contain this type of information.
- // If new information is not empty.
- if (!information.isEmpty()) {
- // Add it to the hash.
- LEVEL2(LOG_FORMAT("informationType: %s = %s", GETSTRING(informationType), GETSTRING(information)));
- mRadioInformation[informationType] = information;
- // Return true to indicate the change.
- return true;
- }
- }
- // Return false to indicate that nothing changed.
- return false;
-}
-
-/*!
- Formatting radio information texts after a change.
- */
-void FmRadioHsWidget::radioInformationChanged()
-{
- LOG_METHOD_ENTER;
- // Clear the rows.
- mRadioInformationFirstRow.clear();
- mRadioInformationSecondRow.clear();
-
- // First row contains station name.
- if (mRadioInformation.contains(KRadioInformationStationName)) {
- mRadioInformationFirstRow.append(mRadioInformation.value(KRadioInformationStationName));
- } else if (mRadioInformation.contains(KRadioInformationFrequency)) {
- // Or frequency.
- mRadioInformationFirstRow.append(mRadioInformation.value(KRadioInformationFrequency));
- }
- LEVEL2(LOG_FORMAT("mRadioInformationFirstRow: %s", GETSTRING(mRadioInformationFirstRow)));
-
- // Second row of information contains radio text.
- if (mRadioInformation.contains(KRadioInformationRt)) {
- mRadioInformationSecondRow.append(mRadioInformation.value(KRadioInformationRt));
- } else if (mRadioInformation.contains(KRadioInformationDynamicPsName)) {
- // Or Dynamic PS name.
- mRadioInformationSecondRow.append(mRadioInformation.value(
- KRadioInformationDynamicPsName));
- } else if (mRadioInformation.contains(KRadioInformationPty)) {
- // Or PTY.
- mRadioInformationSecondRow.append(mRadioInformation.value(KRadioInformationPty));
- }
- LEVEL2(LOG_FORMAT("mRadioInformationSecondRow: %s", GETSTRING(mRadioInformationSecondRow)));
-
- // If second row is empty.
- if (mRadioInformationSecondRow.isEmpty()) {
- // Show only the lonely row.
- mInformationLonelyRowLabel->setPlainText(mRadioInformationFirstRow);
- changeInformationAreaLayout(OneRow);
- }
- else {
- // Else display both rows.
- mInformationFirstRowLabel->setPlainText(mRadioInformationFirstRow);
- mInformationSecondRowLabel->setPlainText(mRadioInformationSecondRow);
- changeInformationAreaLayout(TwoRows);
- }
-}
-
-/*!
- Clears the radio station information. For example, when the station is
- changed, old information should be cleared.
- */
-void FmRadioHsWidget::clearRadioInformation()
-{
- LOG_METHOD_ENTER;
- if (!mRadioInformation.isEmpty()) {
- LEVEL2(LOG("clear radioInformation"));
- mRadioInformation.clear();
- }
-}
-
-/*!
- Handles changes in FM Radio state.
-
- /param value New state of the radio application.
- */
-void FmRadioHsWidget::handleRadioStateChange(const QVariant &value)
-{
- LOG_METHOD;
- int state;
- if (value.canConvert(QVariant::Int)) {
- state = value.toInt();
- } else {
- return;
- }
-
- if (state == mFmRadioState) {
- // State did not change, so return.
- return;
- }
-
- switch (state) {
- case Undefined:
- LEVEL2(LOG("Undefined"));
- // Something went wrong. Widget should not be in this state after onInitialize().
- mFmRadioState = Undefined;
- break;
- case NotRunning:
- LEVEL2(LOG("NotRunning"));
- mFmRadioState = NotRunning;
- mRadioServiceClient->stopMonitoring();
- changePowerButtonOn(false);
- mFavoriteStations = false;
- changeStationButtonsEnabledState(false);
- clearRadioInformation();
- mInformationFirstRowLabel->setPlainText("");
- mInformationSecondRowLabel->setPlainText("");
- mInformationLonelyRowLabel->setPlainText(hbTrId("txt_rad_list_fm_radio"));
- changeInformationAreaLayout(OneRow);
- break;
- case Starting:
- LEVEL2(LOG("Starting"));
- mFmRadioState = Starting;
- changePowerButtonOn(true);
- changeStationButtonsEnabledState(false);
- changeInformationAreaLayout(Animation);
- // This timer is workaround to recover from situation where radio is
- // started from widget but user answers no to the offline start dialog.
- // Stop timer if it is running.
- stopRadioStartingCancelTimer();
- // Set timer as single shot.
- mRadioStartingCancelTimer->setSingleShot(true);
- // Connect timeout.
- connect(mRadioStartingCancelTimer, SIGNAL(timeout()), this,
- SLOT(cancelRadioStartingState()));
- // Start to timeout after delay.
- mRadioStartingCancelTimer->start(KRadioStartingStateCancelDelay);
- break;
- case Running:
- LEVEL2(LOG("Running"));
- mFmRadioState = Running;
- // Stop timer if it is running because radio is now running.
- stopRadioStartingCancelTimer();
- mRadioServiceClient->startMonitoring(
- FmRadioHsWidgetRadioServiceClient::DoNotChange);
- changePowerButtonOn(true);
- changeStationButtonsEnabledState(mFavoriteStations);
- changeInformationAreaLayout(OneRow);
- break;
- case ControllingAudio:
- LEVEL2(LOG("ControllingAudio"));
- mFmRadioState = ControllingAudio;
- changeStationButtonsEnabledState(mFavoriteStations);
- radioInformationChanged();
- break;
- case NotControllingAudio:
- LEVEL2(LOG("NotControllingAudio"));
- mFmRadioState = NotControllingAudio;
- changeStationButtonsEnabledState(mFavoriteStations);
- radioInformationChanged();
- break;
- case Seeking:
- LEVEL2(LOG("Seeking"));
- mFmRadioState = Seeking;
- changeStationButtonsEnabledState(false);
- changeInformationAreaLayout(Animation);
- break;
- case AntennaNotConnected:
- LEVEL2(LOG("AntennaNotConnected"));
- mFmRadioState = AntennaNotConnected;
- changeStationButtonsEnabledState(false);
- mInformationFirstRowLabel->setPlainText("");
- mInformationSecondRowLabel->setPlainText("");
- mInformationLonelyRowLabel->setPlainText(hbTrId("txt_rad_info_connect_wired_headset"));
- changeInformationAreaLayout(OneRow);
- break;
- case Closing:
- LEVEL2(LOG("Closing"));
- mFmRadioState = Closing;
- changePowerButtonOn(false);
- changeStationButtonsEnabledState(false);
- clearRadioInformation();
- mInformationFirstRowLabel->setPlainText("");
- mInformationSecondRowLabel->setPlainText("");
- mInformationLonelyRowLabel->setPlainText(hbTrId("txt_rad_list_fm_radio"));
- changeInformationAreaLayout(OneRow);
- break;
- default:
- LOG("default");
- break;
- }
-}
-
-/*!
- Changes visible widgets of information area stacked layout.
-
- /param InformationAreaLayout The layout to switch visible.
- */
-void FmRadioHsWidget::changeInformationAreaLayout(const InformationAreaLayout layout)
-{
- LOG_METHOD;
- switch (layout) {
- case OneRow:
- LEVEL2(LOG("OneRow"));
- mInformationLonelyRowLabel->show();
- mInformationAreaTwoRowsLayout->hide();
- mAnimationIcon->hide();
- break;
- case TwoRows:
- LEVEL2(LOG("TwoRows"));
- mInformationLonelyRowLabel->hide();
- mInformationAreaTwoRowsLayout->show();
- mAnimationIcon->hide();
- break;
- case Animation:
- LEVEL2(LOG("Animation"));
- mInformationLonelyRowLabel->hide();
- mInformationAreaTwoRowsLayout->hide();
- mAnimationIcon->show();
- break;
- default:
- LOG("default");
- break;
- }
-}
-
-/*!
- Changes state of power button.
-
- */
-void FmRadioHsWidget::changePowerButtonOn(const bool isPowerOn)
-{
- LOG_METHOD;
- QString iconName;
- if (isPowerOn) {
- LEVEL2(LOG("Power on"));
- // Change icon to reflect power on state.
- iconName.append("qtg_mono_power");
- mPowerToggleButton->setIcon(HbIcon(":/ui/resource/mono_power.png"));
- mPowerToggleButton->setText("Off");
- // Connect clicked to closeRadio slot.
- disconnect(mPowerToggleButton, SIGNAL(clicked()), this,
- SLOT(radioToBackground()));
- connect(mPowerToggleButton, SIGNAL(clicked()), this,
- SLOT(closeRadio()));
- } else {
- LEVEL2(LOG("Power off"));
- // Change icon to reflect power off state.
- iconName.append("qtg_mono_power");
- mPowerToggleButton->setIcon(HbIcon(":/ui/resource/mono_power.png"));
- mPowerToggleButton->setText("On");
- // Connect clicked to radioToBackground slot.
- disconnect(mPowerToggleButton, SIGNAL(clicked()), this,
- SLOT(closeRadio()));
- connect(mPowerToggleButton, SIGNAL(clicked()), this,
- SLOT(radioToBackground()));
- }
- changeControlButtonFrameBackground(true, Left, mPowerToggleButton);
-}
-
-/*!
- Changes enabled state of station buttons.
-
- */
-void FmRadioHsWidget::changeStationButtonsEnabledState(const bool enabled)
-{
- LOG_METHOD_ENTER;
- changeControlButtonFrameBackground(enabled, Center, mPreviousPushButton);
- changeControlButtonFrameBackground(enabled, Right, mNextPushButton);
-}
-
-/*!
- Changes background of control button.
-
- /param enabled Is button enabled or disabled.
- /param position Position of the control button in button group.
- /param button The button to change the background.
- */
-void FmRadioHsWidget::changeControlButtonFrameBackground(const bool enabled,
- const ControlButtonPosition position, HbPushButton *button)
-{
- LOG_METHOD_ENTER;
- QString frameGraphicsName("qtg_fr_hsbutton_");
- if (enabled) {
- frameGraphicsName.append("normal");
- } else {
- frameGraphicsName.append("disabled");
- }
- LEVEL2(LOG_FORMAT("frameGraphicsName: %s", GETSTRING(frameGraphicsName)));
- HbFrameDrawer *frameDrawer = new HbFrameDrawer(frameGraphicsName,
- HbFrameDrawer::ThreePiecesHorizontal);
- switch (position) {
- case Left:
- LEVEL2(LOG("Left"));
- frameDrawer->setFileNameSuffixList(QStringList() << "_l" << "_c" << "_cr");
- break;
- case Center:
- LEVEL2(LOG("Center"));
- frameDrawer->setFileNameSuffixList(QStringList() << "_cl" << "_c" << "_cr");
- break;
- case Right:
- LEVEL2(LOG("Right"));
- frameDrawer->setFileNameSuffixList(QStringList() << "_cl" << "_c" << "_r");
- break;
- default:
- LOG("default");
- break;
- }
- button->setFrameBackground(frameDrawer);
- button->setEnabled(enabled);
-}
-
-/*!
- Radio did not start on time. Let's reset the widget's state.
-
- */
-void FmRadioHsWidget::cancelRadioStartingState()
-{
- LOG_SLOT_CALLER;
- handleRadioStateChange(QVariant(NotRunning));
-}
-
-/*!
- Stop the timer canceling radio starting state.
-
- */
-void FmRadioHsWidget::stopRadioStartingCancelTimer()
-{
- LOG_METHOD_ENTER;
- if (mRadioStartingCancelTimer->isActive()) {
- mRadioStartingCancelTimer->stop();
- }
-}
--- a/hswidgetplugin/fmradiohswidgetplugin/src/fmradiohswidgetplugin.cpp Fri Jun 11 13:38:32 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-/*
-* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: FM Radio home screen widget plugin
-*
-*/
-
-#include <qserviceinterfacedescriptor.h>
-#include <qabstractsecuritysession.h>
-#include <qservicecontext.h>
-
-#include "fmradiohswidgetplugin.h"
-#include "fmradiohswidget.h"
-
-
-/*!
- Initialize plugin for FM Radio home screen widget. Contains necessary information about
- the fm radio widget that it can be loaded through QT Service Framework.
-*/
-QObject *FmRadioHsWidgetPlugin::createInstance(const QServiceInterfaceDescriptor &descriptor,
- QServiceContext *context,
- QAbstractSecuritySession *session)
-{
- Q_UNUSED(context);
- Q_UNUSED(session);
-
- if (descriptor.interfaceName() == QLatin1String("com.nokia.symbian.IHomeScreenWidget")) {
- return new FmRadioHsWidget();
- } else {
- return 0;
- }
-}
-
-Q_EXPORT_PLUGIN2(fmradiohswidgetplugin, FmRadioHsWidgetPlugin)
--- a/hswidgetplugin/fmradiohswidgetplugin/src/fmradiohswidgetprofilereader.cpp Fri Jun 11 13:38:32 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,153 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: FM Radio widget process handler
-*
-*/
-
-// System includes
-#include <QDateTime>
-#include <ProfileEngineSDKCRKeys.h>
-#include "xqsettingsmanager.h"
-#include "xqsettingskey.h"
-#include "xqpublishandsubscribeutils.h"
-
-// User includes
-#include "fmradiohswidgetprofilereader.h"
-#include "fmradiohswidget.h"
-#include "radioservicedef.h"
-#include "radiologger.h"
-
-/*!
- Constructor
- */
-FmRadioHsWidgetProfileReader::FmRadioHsWidgetProfileReader(QObject *parent) :
- QObject(parent),
- mSettingsManager(new XQSettingsManager(this)),
- mRadioStatus(-1)
-{
- LOG_METHOD;
- connect(mSettingsManager, SIGNAL(itemDeleted(XQSettingsKey)), this,
- SLOT(itemDeleted(XQSettingsKey)));
- connect(mSettingsManager, SIGNAL(valueChanged(XQSettingsKey, QVariant)),
- this, SLOT(handleChanges(XQSettingsKey, QVariant)));
-}
-
-/*!
- Destructor
- */
-FmRadioHsWidgetProfileReader::~FmRadioHsWidgetProfileReader()
-{
- LOG_METHOD;
-}
-
-
-/*!
- Handling of deletion of listened keys.
-
- \param key Deleted key.
- */
-void FmRadioHsWidgetProfileReader::itemDeleted(const XQSettingsKey &key)
-{
- LOG_METHOD;
- // Profile information will be used for offline query.
-/*
- if (key.uid() == KCRUidProfileEngine.iUid && key.key()
- == KProEngActiveProfile) {
- }
-*/
- if (key.uid() == KRadioPSUid && key.key() == KRadioStartupKey) {
- LOG("KRadioStartupKey deleted");
- startMonitoringRadioRunningStatus();
- }
-}
-
-/*!
- Notifications from settings manager are handled and routed to appropriate
- private slots.
-
- \param key Changed key.
- \param value Value of changed key.
- */
-void FmRadioHsWidgetProfileReader::handleChanges(const XQSettingsKey &key,
- const QVariant& value)
-{
- LOG_SLOT_CALLER;
-
- // Profile information will be used for offline query.
- /*
- if (key.uid() == KCRUidProfileEngine.iUid && key.key()
- == KProEngActiveProfile) {
- currentProfileStatus(value);
- }
- */
-
- if (key.uid() == KRadioPSUid && key.key()
- == KRadioStartupKey) {
- LOG("KRadioStartupKey changed");
- currentRadioRunningStatus(value);
- }
-}
-
-
-/*!
- Handling changes in profile information.
-
- \param value
- */
-/*
-void FmRadioHsWidgetProfileReader::currentProfileStatus(QVariant value)
-{
- if (value.canConvert(QVariant::Int)) {
- emit profileChanged(value.toInt());
- }
-}
-*/
-
-/*!
- Handling changes in radio running P&S key.
-
- \param value is int representation of time in seconds when radio was started.
- */
-void FmRadioHsWidgetProfileReader::currentRadioRunningStatus(const QVariant &value)
-{
- LOG_METHOD;
- if (value.isValid()) {
- if (value.canConvert(QVariant::Int)) {
- mRadioStatus = value.toInt();
- // Emit that radio is running.
- QVariant state(FmRadioHsWidget::Running);
- emit radioRunning(state);
- }
- } else {
- mRadioStatus = -1;
- // Emit that radio is not running.
- QVariant state(FmRadioHsWidget::NotRunning);
- emit radioRunning(state);
- }
-}
-
-/*!
- Start monitoring radio P&S key.
-
- */
-void FmRadioHsWidgetProfileReader::startMonitoringRadioRunningStatus()
-{
- LOG_METHOD;
- XQSettingsKey radioRunningKey(XQSettingsKey::TargetPublishAndSubscribe, KRadioPSUid,
- KRadioStartupKey);
- // Start monitoring.
- mSettingsManager->startMonitoring(radioRunningKey);
- // Read current value.
- currentRadioRunningStatus(mSettingsManager->readItemValue(radioRunningKey));
-}
--- a/hswidgetplugin/fmradiohswidgetplugin/src/fmradiohswidgetradioserviceclient.cpp Fri Jun 11 13:38:32 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,430 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: FM Radio widget radio service client
-*
-*/
-
-// System includes
-#include <xqserviceglobal.h>
-
-// User includes
-#include "fmradiohswidgetradioserviceclient.h"
-#include "fmradiohswidget.h"
-#include "radioservicedef.h"
-#include "radionotificationdata.h"
-#include "radiologger.h"
-
-/*!
- Constructor
- */
-FmRadioHsWidgetRadioServiceClient::FmRadioHsWidgetRadioServiceClient(QObject *parent) :
- QObject(parent),
- mRequestPending(false),
- mRadioMonitorRequest(NULL),
- mRadioControlRequest(NULL),
- mDataInitialized(false)
-{
- LOG_METHOD;
-}
-
-/*!
- Destructor
- */
-FmRadioHsWidgetRadioServiceClient::~FmRadioHsWidgetRadioServiceClient()
-{
- LOG_METHOD;
- stopMonitoring();
-}
-
-/*!
- Close FM Radio application.
-
- */
-void FmRadioHsWidgetRadioServiceClient::doCloseFmRadio()
-{
- LOG_METHOD;
- QVariant commandArgument;
- commandArgument.setValue(static_cast<int>(RadioServiceCommand::PowerOff));
- doSendControlRequest(commandArgument, DoNotChange);
-}
-
-/*!
- Power on FM Radio application.
- This is used only when radio is in Closing state. This merely cancels the
- radio power off delay and unmutes the audio. Currently the starting of radio
- is done with startMonitoring().
- */
-void FmRadioHsWidgetRadioServiceClient::doPowerOnFmRadio()
-{
- LOG_METHOD;
- QVariant commandArgument;
- commandArgument.setValue(static_cast<int>(RadioServiceCommand::PowerOn));
- doSendControlRequest(commandArgument, DoNotChange);
-}
-
-
-/*!
- Bring FM Radio to foreground.
-
- */
-void FmRadioHsWidgetRadioServiceClient::doChangeFmRadioVisibility(
- const FmRadioVisibilty visibility)
-{
- LOG_METHOD;
- QVariant commandArgument;
- switch (visibility) {
- case ToForeground:
- LOG("ToForeground");
- commandArgument.setValue(static_cast<int>(RadioServiceCommand::Foreground));
- break;
- case ToBackground:
- LOG("ToBackground");
- commandArgument.setValue(static_cast<int>(RadioServiceCommand::Background));
- case DoNotChange:
- default:
- LOG("DoNotChange or default");
- break;
- }
- doSendControlRequest(commandArgument, visibility);
-}
-
-/*!
- Changing of FM Radio station.
-
- /param command Command to execute.
- */
-void FmRadioHsWidgetRadioServiceClient::doChangeFmRadioStation(
- const FmRadioStationChangeCommand command)
-{
- LOG_METHOD;
- QVariant commandArgument;
- switch (command) {
- case PreviousFavouriteStation:
- LOG("PreviousFavouriteChannel");
- commandArgument.setValue(static_cast<int>(RadioServiceCommand::Previous));
- break;
- case NextFavouriteStation:
- LOG("NextFavouriteChannel");
- commandArgument.setValue(static_cast<int>(RadioServiceCommand::Next));
- break;
- default:
- LOG("default");
- break;
- }
- doSendControlRequest(commandArgument, DoNotChange);
-}
-
-/*!
- Start FM Radio information listening.
- */
-void FmRadioHsWidgetRadioServiceClient::doSendControlRequest(
- const QVariant &argument, const FmRadioVisibilty visibility)
-{
- LOG_METHOD;
- if (!argument.isValid()) {
- return;
- }
-
- // If there is not mRadioControlRequest already.
- if (!mRadioControlRequest) {
- // Create it.
- createControlServiceRequest();
- }
-
- // Set argument list for request.
- QList<QVariant> arguments;
- arguments.append(argument);
- mRadioControlRequest->setArguments(arguments);
-
- prepareRequestInfo(mRadioControlRequest, visibility);
-
- LOG("Send request");
- bool res = mRadioControlRequest->send();
-
- if (!res) {
- LOG("Send failed");
- int error = mRadioControlRequest->lastError();
- handleRequestError(error);
- }
-}
-
-/*!
- Start FM Radio information listening.
- */
-void FmRadioHsWidgetRadioServiceClient::doSendMonitorRequest(
- const FmRadioVisibilty visibility)
-{
- LOG_METHOD;
- prepareRequestInfo(mRadioMonitorRequest, visibility);
- if (!mRequestPending) {
- LOG("Send request");
- mRequestPending = mRadioMonitorRequest->send();
- }
-}
-
-/*!
- Handle changes in FM Radio information texts.
-
- /param value
- */
-void FmRadioHsWidgetRadioServiceClient::handleFmRadioInformationChange(
- const QVariant &value)
-{
- LOG_METHOD;
- LEVEL2(LOG_SLOT_CALLER);
- // Request is not pending anymore.
- mRequestPending = false;
- // If first request was refresh operation.
- if (!mDataInitialized) {
- LOG("Set operation to KRadioServiceMonitorOperation");
- // Change the operation to the monitoring.
- mRadioMonitorRequest->setOperation(KRadioServiceMonitorOperation);
- // Data is now initialized.
- mDataInitialized = true;
- }
- // Request notifications again.
- startMonitoring(DoNotChange);
-
- // If valid and right kind of data was received.
- if ( value.isValid() && value.canConvert( QVariant::List ) ) {
- QVariantList notificationList = value.toList();
- // Iterate through the list.
- foreach ( const QVariant& variant, notificationList ) {
- // Extract notification data.
- RadioNotificationData notification = variant.value<RadioNotificationData>();
- // And it's type.
- const int notificationId = notification.mType;
- // Emit the new information.
- emit radioInformationChanged( notificationId, notification.mData );
- }
- }
-}
-
-/*!
- Handles request error.
-
- /param int Error value.
- */
-void FmRadioHsWidgetRadioServiceClient::handleRequestError(const int error)
-{
- LOG_METHOD;
- QString errorStr;
- QVariant var(FmRadioHsWidget::NotRunning);
- switch (error) {
- case XQService::ENoError:
- errorStr = "No error";
- break;
- case XQService::EConnectionError:
- errorStr = "Error in IPC Connection";
- break;
- case XQService::EConnectionClosed:
- errorStr = "IPC Connection is closed";
- stopMonitoring();
- handleFmRadioStateChange(var);
- break;
- case XQService::EServerNotFound:
- errorStr = "Can not find server";
- break;
- case XQService::EIPCError:
- errorStr = "Known IPC error defined by SDK";
- break;
- case XQService::EUnknownError:
- errorStr = "Unknown IPC error";
- break;
- case XQService::ERequestPending:
- errorStr = "Already pending request";
- break;
- default:
- errorStr = "default case";
- break;
- }
- LOG(GETSTRING(errorStr));
-}
-
-/*!
- Handle changes in FM Radio state.
-
- /param value New state of FM Radio.
- */
-void FmRadioHsWidgetRadioServiceClient::handleFmRadioStateChange(
- const QVariant &value)
-{
- LOG_METHOD;
- if (value.isValid()) {
- emit radioStateChanged(value);
- }
-}
-
-/*!
- Handle error.
-
- /param errorCode
- /param errorMessage
- */
-void FmRadioHsWidgetRadioServiceClient::handleError(const int errorCode,
- const QString &errorMessage)
-{
- Q_UNUSED(errorMessage)
- LOG_METHOD;
- LEVEL2(LOG_SLOT_CALLER);
- handleRequestError(errorCode);
-}
-
-/*!
- Creates control service request object.
- */
-void FmRadioHsWidgetRadioServiceClient::createControlServiceRequest()
-{
- LOG_METHOD;
- if (!mRadioControlRequest) {
- // Following commented code is for debugging when changing service and interface names.
- //QString fullInterfaceName = /*KRadioServiceName +"."+*/ KRadioServiceControlInterfaceName;
- /*
- QList<XQAiwInterfaceDescriptor> list;
- list = mApplicationManager.list(KRadioServiceName, fullInterfaceName, "");
- XQAiwInterfaceDescriptor interfaceDescriptor;
- foreach (XQAiwInterfaceDescriptor d, list)
- {
- QString in = d.interfaceName();
- QString sn = d.serviceName();
- if (sn == KRadioServiceName && in == fullInterfaceName) {
- interfaceDescriptor = d;
- }
- }
- */
- /*
- mRadioMonitorRequest = mApplicationManager.create(interfaceDescriptor,
- KRadioServiceControlOperation, false);
- */
-
- LOG("Create request");
- mRadioControlRequest = mApplicationManager.create(
- KRadioServiceControlInterfaceName, KRadioServiceControlOperation,
- false);
-
- if (mRadioControlRequest) {
- LOG("Request created");
- // Request is synchronous.
- mRadioControlRequest->setSynchronous(true);
- // Request is not embedded.
- mRadioControlRequest->setEmbedded(false);
- }
- }
-}
-
-/*!
- Creates monitor service request object.
- */
-void FmRadioHsWidgetRadioServiceClient::createMonitorServiceRequest()
-{
- LOG_METHOD;
- if (!mRadioMonitorRequest) {
- // If data is not initialized, set operation to refresh,
- // otherwise to monitor operation.
- QString operation = mDataInitialized ? KRadioServiceMonitorOperation
- : KRadioServiceRefreshOperation;
- QString fullInterfaceName = /*KRadioServiceName +"."+*/ KRadioServiceMonitorInterfaceName;
-
- // Following commented code is for debugging when changing service and interface names.
- /*
- QList<XQAiwInterfaceDescriptor> list;
- list = mApplicationManager.list(KRadioServiceName, fullInterfaceName, "");
- XQAiwInterfaceDescriptor interfaceDescriptor;
- foreach (XQAiwInterfaceDescriptor d, list)
- {
- QString in = d.interfaceName();
- QString sn = d.serviceName();
- if (sn == KRadioServiceName && in == fullInterfaceName) {
- interfaceDescriptor = d;
- }
- }
- */
- /*
- mRadioMonitorRequest = mApplicationManager.create(interfaceDescriptor,
- operation, false);
- */
-
- LOG("Create request");
- mRadioMonitorRequest = mApplicationManager.create(
- KRadioServiceMonitorInterfaceName, operation, false);
-
- if (mRadioMonitorRequest) {
- LOG("Request created");
- // Connect request to handle it's completion.
- connect(mRadioMonitorRequest, SIGNAL(requestOk(const QVariant&)),
- this, SLOT(handleFmRadioInformationChange(const QVariant&)));
- // Connect request to handle it's error.
- connect(mRadioMonitorRequest,
- SIGNAL(requestError(int,const QString&)), this,
- SLOT(handleError(int,const QString&)));
-
- // Request is asynchronous.
- mRadioMonitorRequest->setSynchronous(false);
- // Request is not embedded.
- mRadioMonitorRequest->setEmbedded(false);
- }
- }
-}
-
-/*!
- Start radio monitoring.
- */
-void FmRadioHsWidgetRadioServiceClient::startMonitoring(FmRadioVisibilty visibility)
-{
- LOG_METHOD;
- // If there is no mRadioMonitorRequest create it.
- if (!mRadioMonitorRequest) {
- createMonitorServiceRequest();
- }
- doSendMonitorRequest(visibility);
-}
-
-/*!
- Stops radio monitoring.
- */
-void FmRadioHsWidgetRadioServiceClient::stopMonitoring()
-{
- LOG_METHOD;
- // Delete the mRadioMonitorRequest.
- if (mRadioMonitorRequest) {
- delete mRadioMonitorRequest;
- mRadioMonitorRequest = NULL;
- mRequestPending = false;
- mDataInitialized = false;
- }
-}
-
-/*!
- Prepares the visibility of the request.
- */
-void FmRadioHsWidgetRadioServiceClient::prepareRequestInfo(
- XQAiwRequest *request, const FmRadioVisibilty visibility)
-{
- LOG_METHOD;
- XQRequestInfo info;
- switch (visibility) {
- case ToForeground:
- info.setForeground(true);
- break;
- case ToBackground:
- info.setBackground(true);
- break;
- case DoNotChange:
- default:
- break;
- }
- if (request) {
- request->setInfo(info);
- }
-}
--- a/hswidgetplugin/fmradiohswidgetplugin_exports_to_rom.pri Fri Jun 11 13:38:32 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-#
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description:
-#
-
-BLD_INF_RULES.prj_exports += \
-"$${LITERAL_HASH}include <platform_paths.hrh>"
-
-#iby exports to core
-BLD_INF_RULES.prj_exports += \
-"rom/fmradiohswidgetplugin.iby CORE_APP_LAYER_IBY_EXPORT_PATH(fmradiohswidgetplugin.iby)"
-
-#iby exports to install
-BLD_INF_RULES.prj_exports += \
-"rom/fmradiohswidgetplugininstaller.iby CORE_APP_LAYER_IBY_EXPORT_PATH(fmradiohswidgetplugininstaller.iby)"
-
-#iby exports to language
-#BLD_INF_RULES.prj_exports += \
-#"rom/fmradiohswidgetplugin_resources.iby LANGUAGE_APP_LAYER_IBY_EXPORT_PATH(fmradiohswidgetplugin_resources.iby)"
-
-BLD_INF_RULES.prj_extensions += \
-$$LITERAL_HASH"ifdef MARM" \
- " START EXTENSION app-services/buildstubsis" \
- " OPTION SRCDIR rom" \
- " OPTION SISNAME fmradiohswidgetplugin_stub" \
- " END" \
-$$LITERAL_HASH"endif"
--- a/hswidgetplugin/fmradiohswidgetplugininstaller/fmradiohswidgetplugininstaller.cpp Fri Jun 11 13:38:32 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-/*
-* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Example of home screen widget
-*
-*/
-
-// System includes
-#include <qservicemanager.h>
-#include <QCoreApplication>
-#include <QFile>
-
-// User includes
-#include "radiologger.h"
-
-QTM_USE_NAMESPACE
-
-const QString KXml = "c:/private/20022F35/import/widgetregistry/2002E6D6/fmradiohswidgetplugin.xml";
-
-int main(int argc, char *argv[])
-{
- LOG_METHOD;
-
- QCoreApplication app(argc, argv);
-
- QServiceManager s;
-
- if (QFile::exists(KXml)) {
- LOG_FORMAT( "Add %s service", GETSTRING(KXml) );
- s.addService(KXml);
- } else {
- LOG("Remove fmradiohswidgetplugin service.");
- s.removeService("fmradiohswidgetplugin");
- }
-}
--- a/hswidgetplugin/fmradiohswidgetplugininstaller/fmradiohswidgetplugininstaller.pro Fri Jun 11 13:38:32 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-#
-# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description: Example of home screen widget
-#
-
-include(../buildflags.pri)
-
-TEMPLATE = app
-
-QT = core
-CONFIG += no_icon
-
-CONFIG += mobility
-MOBILITY = serviceframework
-
-SOURCES += fmradiohswidgetplugininstaller.cpp
-SOURCES += ../../common/radiologger.cpp
-
-INCLUDEPATH += ../../common
-
-symbian {
- TARGET.CAPABILITY = ALL -TCB
-}
--- a/hswidgetplugin/hswidgetplugin.pro Fri Jun 11 13:38:32 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-#
-# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description: Example of home screen widget
-#
-
-CONFIG += ordered
-TEMPLATE = subdirs
-SUBDIRS = fmradiohswidgetplugin \
- fmradiohswidgetplugininstaller
-
-symbian:include(fmradiohswidgetplugin_exports_to_rom.pri)
--- a/hswidgetplugin/rom/fmradiohswidgetplugin.iby Fri Jun 11 13:38:32 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-#ifndef __FMRADIOHSWIDGETPLUGIN_IBY__
-#define __FMRADIOHSWIDGETPLUGIN_IBY__
-
-file=ABI_DIR\BUILD_DIR\fmradiohswidgetplugin.dll SHARED_LIB_DIR\fmradiohswidgetplugin.dll
-data=ZPRIVATE\20022f35\import\widgetregistry\2002E6D6\fmradiohswidgetplugin.qtplugin private\20022f35\import\widgetregistry\2002E6D6\fmradiohswidgetplugin.qtplugin
-data=ZPRIVATE\20022f35\import\widgetregistry\2002E6D6\fmradiohswidgetplugin.manifest private\20022f35\import\widgetregistry\2002E6D6\fmradiohswidgetplugin.manifest
-data=ZPRIVATE\20022f35\import\widgetregistry\2002E6D6\fmradiohswidgetplugin.xml private\20022f35\import\widgetregistry\2002E6D6\fmradiohswidgetplugin.xml
-
-
-#endif //__FMRADIOHSWIDGETPLUGIN_IBY__
--- a/hswidgetplugin/rom/fmradiohswidgetplugin_stub.pkg Fri Jun 11 13:38:32 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-;
-; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description: Stub package file for FM Radio home screen widget
-;
-
-; Languages
-&EN
-
-; Header
-#{"fmradiohswidgetplugin"}, (0x2002E6D6), 1, 0, 0, TYPE=SA
-
-; Localised Vendor name
-%{"Nokia"}
-
-; Unique Vendor name
-:"Nokia"
\ No newline at end of file
--- a/hswidgetplugin/rom/fmradiohswidgetplugininstaller.iby Fri Jun 11 13:38:32 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-#ifndef __FMRADIOHSWIDGETPLUGININSTALLER_IBY__
-#define __FMRADIOHSWIDGETPLUGININSTALLER_IBY__
-
-S60_APP_EXE(fmradiohswidgetplugininstaller)
-
-#endif //__FMRADIOHSWIDGETPLUGININSTALLER_IBY__
--- a/hswidgetplugin/sis/fmradiohswidgetplugin.pkg Fri Jun 11 13:38:32 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-; Language
-&EN
-
-; SIS header: name, uid, version
-#{"fmradiohswidgetplugin"},(0x2002E6D6),1,0,0
-
-; Localised Vendor name
-%{"Vendor"}
-
-; Unique Vendor name
-:"Vendor"
-
-; Manual PKG pre-rules from PRO files
-; Default HW/platform dependencies
-[0x101F7961],0,0,0,{"S60ProductID"}
-[0x102032BE],0,0,0,{"S60ProductID"}
-[0x102752AE],0,0,0,{"S60ProductID"}
-[0x1028315F],0,0,0,{"S60ProductID"}
-
-"/epoc32/release/armv5/urel/fmradiohswidgetplugin.dll" - "!:/sys/bin/fmradiohswidgetplugin.dll"
-"../fmradiohswidgetplugin/qmakepluginstubs/fmradiohswidgetplugin.qtplugin" - "!:/private/20022F35/import/widgetregistry/2002E6D6/fmradiohswidgetplugin.qtplugin"
-"../fmradiohswidgetplugin/resource/fmradiohswidgetplugin.manifest" - "!:/private/20022F35/import/widgetregistry/2002E6D6/fmradiohswidgetplugin.manifest"
-"../fmradiohswidgetplugin/resource/fmradiohswidgetplugin.s60xml" - "!:/private/20022F35/import/widgetregistry/2002E6D6/fmradiohswidgetplugin.xml"
-"../fmradiohswidgetplugin/resource/fmradiohswidgetplugin.css" - "!:/private/20022F35/import/widgetregistry/2002E6D6/fmradiohswidgetplugin.css"
-;"/epoc32/data/z/private/20022F35/import/widgetregistry/2002E6D6/fmradiohswidgetplugin.s60xml" - "!:/private/20022F35/import/widgetregistry/2002E6D6/fmradiohswidgetplugin.xml"
-;"../fmradiohswidgetplugin/resource/fmradiohswidgetplugin.xml" - "!:/private/20022F35/import/widgetregistry/2002E6D6/fmradiohswidgetplugin.xml"
-;"../fmradiohswidgetplugin/resource/fmradiohswidgetplugin_icon.png" - "!:/private/20022F35/import/widgetregistry/2002E6D6/fmradiohswidgetplugin_icon.png"
-
-"/epoc32/data/z/resource/qt/translations/fmradiohswidgetplugin.qm" - "!:/resource/qt/translations/fmradiohswidgetplugin.qm"
-"/epoc32/data/z/resource/qt/translations/fmradiohswidgetplugin_en_us.qm" - "!:/resource/qt/translations/fmradiohswidgetplugin_en_us.qm"
-
-"/epoc32/release/armv5/urel/fmradiohswidgetplugininstaller.exe" - "!:/sys/bin/fmradiohswidgetplugininstaller.exe", FR, RB, RW
--- a/radio.pro Fri Jun 11 13:38:32 2010 +0300
+++ b/radio.pro Fri Jun 25 19:09:05 2010 +0300
@@ -20,5 +20,5 @@
symbian: {
BLD_INF_RULES.prj_mmpfiles += $$LITERAL_HASH"include \"radioengine/group/bld.inf\""
SUBDIRS += radioapp
- SUBDIRS += hswidgetplugin
+ SUBDIRS += radiohswidget
}
\ No newline at end of file
Binary file radioapp/bin/fmradio_en_US.qm has changed
--- a/radioapp/buildflags.pri Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/buildflags.pri Fri Jun 25 19:09:05 2010 +0300
@@ -23,9 +23,6 @@
# Use of some debugging controls that are not part of official UI spec
# RADIOFLAGS += USE_DEBUGGING_CONTROLS
-# Reads the layout docml files and images from e:/radiotest/ folder
-# RADIOFLAGS += USE_LAYOUT_FROM_E_DRIVE
-
# Flag to use dummy radio data read from XML file
# RADIOFLAGS += USE_DUMMY_RADIO_DATA
@@ -104,8 +101,14 @@
TARGET.EPOCALLOWDLLDATA = 1
TARGET.VID = VID_DEFAULT
TARGET.CAPABILITY = CAP_GENERAL_DLL
+ INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
+ SYMBIAN_PLATFORMS = WINSCW ARMV5
+ MMP_RULES += SMPSAFE
}
+# QT 4.7 changes the def file location so force them to stay where they are
+defFilePath = ..
+
win32: {
DEFINES += BUILD_WIN32
DESTDIR = ../bin
@@ -123,10 +126,7 @@
symbian:DEF_FILE = not_used.def
}
-# $$_PRO_FILE_PWD_ points to the directory of the pro file
-MOC_DIR = $$_PRO_FILE_PWD_/tmp
-RCC_DIR = $$_PRO_FILE_PWD_/tmp
-OBJECTS_DIR = $$_PRO_FILE_PWD_/tmp
-UI_DIR = $$_PRO_FILE_PWD_/tmp
-UI_HEADERS_DIR = $$_PRO_FILE_PWD_/tmp
-UI_SOURCES_DIR = $$_PRO_FILE_PWD_/tmp
+# Place generated files away from the source folder
+MOC_DIR = /epoc32/build/radioapp/$$TMP_DIR_NAME
+RCC_DIR = /epoc32/build/radioapp/$$TMP_DIR_NAME
+OBJECTS_DIR = /epoc32/build/radioapp/$$TMP_DIR_NAME
--- a/radioapp/bwins/fmradiouiengineu.def Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/bwins/fmradiouiengineu.def Fri Jun 25 19:09:05 2010 +0300
@@ -11,222 +11,222 @@
?region@RadioUiEngine@@QBE?AW4Region@RadioRegion@@XZ @ 10 NONAME ; enum RadioRegion::Region RadioUiEngine::region(void) const
?frequency@RadioStation@@QBEIXZ @ 11 NONAME ; unsigned int RadioStation::frequency(void) const
?setFavoriteByFrequency@RadioStationModel@@QAEXI_N@Z @ 12 NONAME ; void RadioStationModel::setFavoriteByFrequency(unsigned int, bool)
- ??_ERadioHistoryItem@@UAE@I@Z @ 13 NONAME ; RadioHistoryItem::~RadioHistoryItem(unsigned int)
- ?isInitialized@RadioUiEngine@@QBE_NXZ @ 14 NONAME ; bool RadioUiEngine::isInitialized(void) const
- ?staticMetaObject@RadioUiEngine@@2UQMetaObject@@B @ 15 NONAME ; struct QMetaObject const RadioUiEngine::staticMetaObject
- ?indexFromFrequency@RadioStationModel@@QAEHI@Z @ 16 NONAME ; int RadioStationModel::indexFromFrequency(unsigned int)
- ?stationsInRange@RadioStationModel@@QAE?AV?$QList@VRadioStation@@@@II@Z @ 17 NONAME ; class QList<class RadioStation> RadioStationModel::stationsInRange(unsigned int, unsigned int)
- ?setName@RadioStation@@QAEXABVQString@@@Z @ 18 NONAME ; void RadioStation::setName(class QString const &)
- ?settings@RadioUiEngine@@QAEAAVRadioSettingsIf@@XZ @ 19 NONAME ; class RadioSettingsIf & RadioUiEngine::settings(void)
- ?emitAntennaStatusChanged@RadioUiEngine@@AAEX_N@Z @ 20 NONAME ; void RadioUiEngine::emitAntennaStatusChanged(bool)
- ?hasPiCode@RadioStation@@QBE_NXZ @ 21 NONAME ; bool RadioStation::hasPiCode(void) const
- ??_ERadioScannerEngine@@UAE@I@Z @ 22 NONAME ; RadioScannerEngine::~RadioScannerEngine(unsigned int)
- ?setFavoriteByPreset@RadioStationModel@@QAEXH_N@Z @ 23 NONAME ; void RadioStationModel::setFavoriteByPreset(int, bool)
- ?rdsAvailabilityChanged@RadioUiEngine@@IAEX_N@Z @ 24 NONAME ; void RadioUiEngine::rdsAvailabilityChanged(bool)
- ?decrementReferenceCount@RadioHistoryItem@@AAEXXZ @ 25 NONAME ; void RadioHistoryItem::decrementReferenceCount(void)
- ?findPresetIndex@RadioStationModel@@QAEHHAAVRadioStation@@@Z @ 26 NONAME ; int RadioStationModel::findPresetIndex(int, class RadioStation &)
- ?stationHandlerIf@RadioStationModel@@QAEAAVRadioStationHandlerIf@@XZ @ 27 NONAME ; class RadioStationHandlerIf & RadioStationModel::stationHandlerIf(void)
- ?qt_metacall@RadioHistoryModel@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 28 NONAME ; int RadioHistoryModel::qt_metacall(enum QMetaObject::Call, int, void * *)
- ?emitVolumeChanged@RadioUiEngine@@AAEXH@Z @ 29 NONAME ; void RadioUiEngine::emitVolumeChanged(int)
- ?qt_metacall@RadioUiEngine@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 30 NONAME ; int RadioUiEngine::qt_metacall(enum QMetaObject::Call, int, void * *)
+ ?isInitialized@RadioUiEngine@@QBE_NXZ @ 13 NONAME ; bool RadioUiEngine::isInitialized(void) const
+ ?staticMetaObject@RadioUiEngine@@2UQMetaObject@@B @ 14 NONAME ; struct QMetaObject const RadioUiEngine::staticMetaObject
+ ?indexFromFrequency@RadioStationModel@@QAEHI@Z @ 15 NONAME ; int RadioStationModel::indexFromFrequency(unsigned int)
+ ?stationsInRange@RadioStationModel@@QAE?AV?$QList@VRadioStation@@@@II@Z @ 16 NONAME ; class QList<class RadioStation> RadioStationModel::stationsInRange(unsigned int, unsigned int)
+ ?settings@RadioUiEngine@@QAEAAVRadioSettingsIf@@XZ @ 17 NONAME ; class RadioSettingsIf & RadioUiEngine::settings(void)
+ ?emitAntennaStatusChanged@RadioUiEngine@@AAEX_N@Z @ 18 NONAME ; void RadioUiEngine::emitAntennaStatusChanged(bool)
+ ?hasPiCode@RadioStation@@QBE_NXZ @ 19 NONAME ; bool RadioStation::hasPiCode(void) const
+ ??_ERadioScannerEngine@@UAE@I@Z @ 20 NONAME ; RadioScannerEngine::~RadioScannerEngine(unsigned int)
+ ?setFavoriteByPreset@RadioStationModel@@QAEXH_N@Z @ 21 NONAME ; void RadioStationModel::setFavoriteByPreset(int, bool)
+ ?rdsAvailabilityChanged@RadioUiEngine@@IAEX_N@Z @ 22 NONAME ; void RadioUiEngine::rdsAvailabilityChanged(bool)
+ ?findPresetIndex@RadioStationModel@@QAEHHAAVRadioStation@@@Z @ 23 NONAME ; int RadioStationModel::findPresetIndex(int, class RadioStation &)
+ ?stationHandlerIf@RadioStationModel@@QAEAAVRadioStationHandlerIf@@XZ @ 24 NONAME ; class RadioStationHandlerIf & RadioStationModel::stationHandlerIf(void)
+ ?qt_metacall@RadioHistoryModel@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 25 NONAME ; int RadioHistoryModel::qt_metacall(enum QMetaObject::Call, int, void * *)
+ ?frequencyString@RadioStation@@QBE?AVQString@@XZ @ 26 NONAME ; class QString RadioStation::frequencyString(void) const
+ ?emitVolumeChanged@RadioUiEngine@@AAEXH@Z @ 27 NONAME ; void RadioUiEngine::emitVolumeChanged(int)
+ ?qt_metacall@RadioUiEngine@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 28 NONAME ; int RadioUiEngine::qt_metacall(enum QMetaObject::Call, int, void * *)
+ ?reset@RadioStation@@AAEXXZ @ 29 NONAME ; void RadioStation::reset(void)
+ ?createScannerEngine@RadioUiEngine@@QAE?AV?$QSharedPointer@VRadioScannerEngine@@@@XZ @ 30 NONAME ; class QSharedPointer<class RadioScannerEngine> RadioUiEngine::createScannerEngine(void)
?emitAudioRouteChanged@RadioUiEngine@@AAEX_N@Z @ 31 NONAME ; void RadioUiEngine::emitAudioRouteChanged(bool)
?addItem@RadioHistoryModel@@AAEXABVQString@@0ABVRadioStation@@@Z @ 32 NONAME ; void RadioHistoryModel::addItem(class QString const &, class QString const &, class RadioStation const &)
?d_func@RadioScannerEngine@@ABEPBVRadioScannerEnginePrivate@@XZ @ 33 NONAME ; class RadioScannerEnginePrivate const * RadioScannerEngine::d_func(void) const
- ?setGenre@RadioStation@@QAEXH@Z @ 34 NONAME ; void RadioStation::setGenre(int)
- ??4RadioStation@@QAEAAV0@ABV0@@Z @ 35 NONAME ; class RadioStation & RadioStation::operator=(class RadioStation const &)
- ?toggleAudioRoute@RadioUiEngine@@QAEXXZ @ 36 NONAME ; void RadioUiEngine::toggleAudioRoute(void)
- ?stationModel@RadioUiEngine@@QAEAAVRadioStationModel@@XZ @ 37 NONAME ; class RadioStationModel & RadioUiEngine::stationModel(void)
- ?unsetType@RadioStation@@QAEXV?$QFlags@W4TypeFlag@RadioStation@@@@@Z @ 38 NONAME ; void RadioStation::unsetType(class QFlags<enum RadioStation::TypeFlag>)
- ?toggleTagging@RadioHistoryModel@@QAEXABVRadioHistoryItem@@H@Z @ 39 NONAME ; void RadioHistoryModel::toggleTagging(class RadioHistoryItem const &, int)
- ?muteChanged@RadioUiEngine@@IAEX_N@Z @ 40 NONAME ; void RadioUiEngine::muteChanged(bool)
- ?maxFrequency@RadioUiEngine@@QBEIXZ @ 41 NONAME ; unsigned int RadioUiEngine::maxFrequency(void) const
- ?setIcons@RadioStationModel@@QAEXABVQIcon@@0@Z @ 42 NONAME ; void RadioStationModel::setIcons(class QIcon const &, class QIcon const &)
- ?saveStation@RadioStationModel@@QAEXAAVRadioStation@@@Z @ 43 NONAME ; void RadioStationModel::saveStation(class RadioStation &)
- ?getStaticMetaObject@RadioHistoryModel@@SAABUQMetaObject@@XZ @ 44 NONAME ; struct QMetaObject const & RadioHistoryModel::getStaticMetaObject(void)
- ?findUnusedPresetIndex@RadioStationModel@@AAEHXZ @ 45 NONAME ; int RadioStationModel::findUnusedPresetIndex(void)
- ?hasChanged@RadioStation@@QBE_NXZ @ 46 NONAME ; bool RadioStation::hasChanged(void) const
- ?trUtf8@RadioScannerEngine@@SA?AVQString@@PBD0H@Z @ 47 NONAME ; class QString RadioScannerEngine::trUtf8(char const *, char const *, int)
- ?isScanning@RadioUiEngine@@QBE_NXZ @ 48 NONAME ; bool RadioUiEngine::isScanning(void) const
- ?dynamicPsCheckEnded@RadioStationModel@@AAEXXZ @ 49 NONAME ; void RadioStationModel::dynamicPsCheckEnded(void)
- ?d_func@RadioHistoryModel@@AAEPAVRadioHistoryModelPrivate@@XZ @ 50 NONAME ; class RadioHistoryModelPrivate * RadioHistoryModel::d_func(void)
+ ??4RadioStation@@QAEAAV0@ABV0@@Z @ 34 NONAME ; class RadioStation & RadioStation::operator=(class RadioStation const &)
+ ?toggleAudioRoute@RadioUiEngine@@QAEXXZ @ 35 NONAME ; void RadioUiEngine::toggleAudioRoute(void)
+ ?stationModel@RadioUiEngine@@QAEAAVRadioStationModel@@XZ @ 36 NONAME ; class RadioStationModel & RadioUiEngine::stationModel(void)
+ ?unsetType@RadioStation@@QAEXV?$QFlags@W4TypeFlag@RadioStation@@@@@Z @ 37 NONAME ; void RadioStation::unsetType(class QFlags<enum RadioStation::TypeFlag>)
+ ?toggleTagging@RadioHistoryModel@@QAEXABVRadioHistoryItem@@H@Z @ 38 NONAME ; void RadioHistoryModel::toggleTagging(class RadioHistoryItem const &, int)
+ ?muteChanged@RadioUiEngine@@IAEX_N@Z @ 39 NONAME ; void RadioUiEngine::muteChanged(bool)
+ ?maxFrequency@RadioUiEngine@@QBEIXZ @ 40 NONAME ; unsigned int RadioUiEngine::maxFrequency(void) const
+ ?setIcons@RadioStationModel@@QAEXABVQIcon@@0@Z @ 41 NONAME ; void RadioStationModel::setIcons(class QIcon const &, class QIcon const &)
+ ?saveStation@RadioStationModel@@QAEXAAVRadioStation@@@Z @ 42 NONAME ; void RadioStationModel::saveStation(class RadioStation &)
+ ?getStaticMetaObject@RadioHistoryModel@@SAABUQMetaObject@@XZ @ 43 NONAME ; struct QMetaObject const & RadioHistoryModel::getStaticMetaObject(void)
+ ?findUnusedPresetIndex@RadioStationModel@@AAEHXZ @ 44 NONAME ; int RadioStationModel::findUnusedPresetIndex(void)
+ ?hasChanged@RadioStation@@QBE_NXZ @ 45 NONAME ; bool RadioStation::hasChanged(void) const
+ ?trUtf8@RadioScannerEngine@@SA?AVQString@@PBD0H@Z @ 46 NONAME ; class QString RadioScannerEngine::trUtf8(char const *, char const *, int)
+ ?isScanning@RadioUiEngine@@QBE_NXZ @ 47 NONAME ; bool RadioUiEngine::isScanning(void) const
+ ?dynamicPsCheckEnded@RadioStationModel@@AAEXXZ @ 48 NONAME ; void RadioStationModel::dynamicPsCheckEnded(void)
+ ?d_func@RadioHistoryModel@@AAEPAVRadioHistoryModelPrivate@@XZ @ 49 NONAME ; class RadioHistoryModelPrivate * RadioHistoryModel::d_func(void)
+ ?setFrequency@RadioStation@@AAEXI@Z @ 50 NONAME ; void RadioStation::setFrequency(unsigned int)
?piCodeToCallSign@RadioStation@@AAE?AVQString@@I@Z @ 51 NONAME ; class QString RadioStation::piCodeToCallSign(unsigned int)
?seekStation@RadioUiEngine@@QAEXH@Z @ 52 NONAME ; void RadioUiEngine::seekStation(int)
- ?setPiCode@RadioStation@@QAE_NHW4Region@RadioRegion@@@Z @ 53 NONAME ; bool RadioStation::setPiCode(int, enum RadioRegion::Region)
- ?favoriteChanged@RadioStationModel@@IAEXABVRadioStation@@@Z @ 54 NONAME ; void RadioStationModel::favoriteChanged(class RadioStation const &)
- ?radioStatusChanged@RadioUiEngine@@IAEX_N@Z @ 55 NONAME ; void RadioUiEngine::radioStatusChanged(bool)
- ?setIcons@RadioHistoryModel@@QAEXABVQIcon@@0@Z @ 56 NONAME ; void RadioHistoryModel::setIcons(class QIcon const &, class QIcon const &)
- ?isCurrentSongRecognized@RadioHistoryModel@@QBE_NXZ @ 57 NONAME ; bool RadioHistoryModel::isCurrentSongRecognized(void) const
+ ?favoriteChanged@RadioStationModel@@IAEXABVRadioStation@@@Z @ 53 NONAME ; void RadioStationModel::favoriteChanged(class RadioStation const &)
+ ?radioStatusChanged@RadioUiEngine@@IAEX_N@Z @ 54 NONAME ; void RadioUiEngine::radioStatusChanged(bool)
+ ?setIcons@RadioHistoryModel@@QAEXABVQIcon@@0@Z @ 55 NONAME ; void RadioHistoryModel::setIcons(class QIcon const &, class QIcon const &)
+ ?isCurrentSongRecognized@RadioHistoryModel@@QBE_NXZ @ 56 NONAME ; bool RadioHistoryModel::isCurrentSongRecognized(void) const
+ ?addStation@RadioStationModel@@QAEXABVRadioStation@@@Z @ 57 NONAME ; void RadioStationModel::addStation(class RadioStation const &)
?clearRadioTextPlus@RadioHistoryModel@@AAEXXZ @ 58 NONAME ; void RadioHistoryModel::clearRadioTextPlus(void)
- ?addStation@RadioStationModel@@QAEXABVRadioStation@@@Z @ 59 NONAME ; void RadioStationModel::addStation(class RadioStation const &)
- ?lastTunedFrequency@RadioUiEngine@@SAIXZ @ 60 NONAME ; unsigned int RadioUiEngine::lastTunedFrequency(void)
- ?favoriteCount@RadioStationModel@@QAEHXZ @ 61 NONAME ; int RadioStationModel::favoriteCount(void)
- ??1RadioScannerEngine@@UAE@XZ @ 62 NONAME ; RadioScannerEngine::~RadioScannerEngine(void)
- ?tunedToFrequency@RadioUiEngine@@IAEXIH@Z @ 63 NONAME ; void RadioUiEngine::tunedToFrequency(unsigned int, int)
- ?tr@RadioUiEngine@@SA?AVQString@@PBD0H@Z @ 64 NONAME ; class QString RadioUiEngine::tr(char const *, char const *, int)
- ?isScanning@RadioScannerEngine@@QBE_NXZ @ 65 NONAME ; bool RadioScannerEngine::isScanning(void) const
+ ?favoriteCount@RadioStationModel@@QAEHXZ @ 59 NONAME ; int RadioStationModel::favoriteCount(void)
+ ??1RadioScannerEngine@@UAE@XZ @ 60 NONAME ; RadioScannerEngine::~RadioScannerEngine(void)
+ ?tunedToFrequency@RadioUiEngine@@IAEXIH@Z @ 61 NONAME ; void RadioUiEngine::tunedToFrequency(unsigned int, int)
+ ?tr@RadioUiEngine@@SA?AVQString@@PBD0H@Z @ 62 NONAME ; class QString RadioUiEngine::tr(char const *, char const *, int)
+ ?launchBrowser@RadioUiEngine@@QAEXABVQString@@@Z @ 63 NONAME ; void RadioUiEngine::launchBrowser(class QString const &)
+ ?isScanning@RadioScannerEngine@@QBE_NXZ @ 64 NONAME ; bool RadioScannerEngine::isScanning(void) const
+ ??1RadioHistoryItem@@QAE@XZ @ 65 NONAME ; RadioHistoryItem::~RadioHistoryItem(void)
?trUtf8@RadioScannerEngine@@SA?AVQString@@PBD0@Z @ 66 NONAME ; class QString RadioScannerEngine::trUtf8(char const *, char const *)
- ?emitDataChanged@RadioStationModel@@AAEXABVRadioStation@@@Z @ 67 NONAME ; void RadioStationModel::emitDataChanged(class RadioStation const &)
- ?setPowerOff@RadioUiEngine@@QAEXH@Z @ 68 NONAME ; void RadioUiEngine::setPowerOff(int)
- ?isRadioOn@RadioUiEngine@@QBE_NXZ @ 69 NONAME ; bool RadioUiEngine::isRadioOn(void) const
- ?continueScanning@RadioScannerEngine@@QAEXXZ @ 70 NONAME ; void RadioScannerEngine::continueScanning(void)
- ?trUtf8@RadioHistoryModel@@SA?AVQString@@PBD0H@Z @ 71 NONAME ; class QString RadioHistoryModel::trUtf8(char const *, char const *, int)
- ?list@RadioStationModel@@QBEABV?$QMap@IVRadioStation@@@@XZ @ 72 NONAME ; class QMap<unsigned int, class RadioStation> const & RadioStationModel::list(void) const
- ?tr@RadioStationModel@@SA?AVQString@@PBD0@Z @ 73 NONAME ; class QString RadioStationModel::tr(char const *, char const *)
- ?setChangeFlags@RadioStation@@QAEXV?$QFlags@W4ChangeFlag@RadioStation@@@@@Z @ 74 NONAME ; void RadioStation::setChangeFlags(class QFlags<enum RadioStation::ChangeFlag>)
+ ?hasName@RadioStation@@QBE_NXZ @ 67 NONAME ; bool RadioStation::hasName(void) const
+ ?emitDataChanged@RadioStationModel@@AAEXABVRadioStation@@@Z @ 68 NONAME ; void RadioStationModel::emitDataChanged(class RadioStation const &)
+ ?setPowerOff@RadioUiEngine@@QAEXH@Z @ 69 NONAME ; void RadioUiEngine::setPowerOff(int)
+ ?isRadioOn@RadioUiEngine@@QBE_NXZ @ 70 NONAME ; bool RadioUiEngine::isRadioOn(void) const
+ ?continueScanning@RadioScannerEngine@@QAEXXZ @ 71 NONAME ; void RadioScannerEngine::continueScanning(void)
+ ?trUtf8@RadioHistoryModel@@SA?AVQString@@PBD0H@Z @ 72 NONAME ; class QString RadioHistoryModel::trUtf8(char const *, char const *, int)
+ ?list@RadioStationModel@@QBEABV?$QMap@IVRadioStation@@@@XZ @ 73 NONAME ; class QMap<unsigned int, class RadioStation> const & RadioStationModel::list(void) const
+ ?tr@RadioStationModel@@SA?AVQString@@PBD0@Z @ 74 NONAME ; class QString RadioStationModel::tr(char const *, char const *)
?hasRds@RadioStation@@QBE_NXZ @ 75 NONAME ; bool RadioStation::hasRds(void) const
?findClosest@RadioStationModel@@QAE?AVRadioStation@@IW4Mode@StationSkip@@@Z @ 76 NONAME ; class RadioStation RadioStationModel::findClosest(unsigned int, enum StationSkip::Mode)
?flags@RadioStationModel@@UBE?AV?$QFlags@W4ItemFlag@Qt@@@@ABVQModelIndex@@@Z @ 77 NONAME ; class QFlags<enum Qt::ItemFlag> RadioStationModel::flags(class QModelIndex const &) const
- ?detach@RadioStation@@QAEXXZ @ 78 NONAME ; void RadioStation::detach(void)
+ ?launchRadioServer@RadioUiEngine@@SAXXZ @ 78 NONAME ; void RadioUiEngine::launchRadioServer(void)
?staticMetaObject@RadioScannerEngine@@2UQMetaObject@@B @ 79 NONAME ; struct QMetaObject const RadioScannerEngine::staticMetaObject
?id@RadioHistoryItem@@QBEHXZ @ 80 NONAME ; int RadioHistoryItem::id(void) const
?stationsInRange@RadioUiEngine@@QAE?AV?$QList@VRadioStation@@@@II@Z @ 81 NONAME ; class QList<class RadioStation> RadioUiEngine::stationsInRange(unsigned int, unsigned int)
?trUtf8@RadioUiEngine@@SA?AVQString@@PBD0@Z @ 82 NONAME ; class QString RadioUiEngine::trUtf8(char const *, char const *)
?tr@RadioScannerEngine@@SA?AVQString@@PBD0H@Z @ 83 NONAME ; class QString RadioScannerEngine::tr(char const *, char const *, int)
- ?radioText@RadioStation@@QBE?AVQString@@XZ @ 84 NONAME ; class QString RadioStation::radioText(void) const
- ?setData@RadioStationModel@@UAE_NABVQModelIndex@@ABVQVariant@@H@Z @ 85 NONAME ; bool RadioStationModel::setData(class QModelIndex const &, class QVariant const &, int)
- ??0RadioStation@@QAE@HI@Z @ 86 NONAME ; RadioStation::RadioStation(int, unsigned int)
- ?isInManualSeekMode@RadioUiEngine@@QBE_NXZ @ 87 NONAME ; bool RadioUiEngine::isInManualSeekMode(void) const
- ?setPsType@RadioStation@@QAEXV?$QFlags@W4PsTypeFlag@RadioStation@@@@@Z @ 88 NONAME ; void RadioStation::setPsType(class QFlags<enum RadioStation::PsTypeFlag>)
+ ?setPiCode@RadioStation@@AAE_NHW4Region@RadioRegion@@@Z @ 84 NONAME ; bool RadioStation::setPiCode(int, enum RadioRegion::Region)
+ ?data_ptr@RadioHistoryItem@@QAEAAV?$QSharedDataPointer@VRadioHistoryItemPrivate@@@@XZ @ 85 NONAME ; class QSharedDataPointer<class RadioHistoryItemPrivate> & RadioHistoryItem::data_ptr(void)
+ ?radioText@RadioStation@@QBE?AVQString@@XZ @ 86 NONAME ; class QString RadioStation::radioText(void) const
+ ?setData@RadioStationModel@@UAE_NABVQModelIndex@@ABVQVariant@@H@Z @ 87 NONAME ; bool RadioStationModel::setData(class QModelIndex const &, class QVariant const &, int)
+ ?isInManualSeekMode@RadioUiEngine@@QBE_NXZ @ 88 NONAME ; bool RadioUiEngine::isInManualSeekMode(void) const
?itemAtIndex@RadioHistoryModel@@QBE?AVRadioHistoryItem@@ABVQModelIndex@@@Z @ 89 NONAME ; class RadioHistoryItem RadioHistoryModel::itemAtIndex(class QModelIndex const &) const
?setVolume@RadioUiEngine@@QAEXH@Z @ 90 NONAME ; void RadioUiEngine::setVolume(int)
?setFavorite@RadioStation@@QAEX_N@Z @ 91 NONAME ; void RadioStation::setFavorite(bool)
- ?emitChangeSignals@RadioStationModel@@AAEXABVRadioStation@@V?$QFlags@W4ChangeFlag@RadioStation@@@@@Z @ 92 NONAME ; void RadioStationModel::emitChangeSignals(class RadioStation const &, class QFlags<enum RadioStation::ChangeFlag>)
- ?d_func@RadioStationModel@@ABEPBVRadioStationModelPrivate@@XZ @ 93 NONAME ; class RadioStationModelPrivate const * RadioStationModel::d_func(void) const
- ?setPresetIndex@RadioStation@@QAEXH@Z @ 94 NONAME ; void RadioStation::setPresetIndex(int)
- ?tr@RadioStationModel@@SA?AVQString@@PBD0H@Z @ 95 NONAME ; class QString RadioStationModel::tr(char const *, char const *, int)
+ ?d_func@RadioStationModel@@ABEPBVRadioStationModelPrivate@@XZ @ 92 NONAME ; class RadioStationModelPrivate const * RadioStationModel::d_func(void) const
+ ?emitChangeSignals@RadioStationModel@@AAEXABVRadioStation@@V?$QFlags@W4ChangeFlag@RadioStation@@@@@Z @ 93 NONAME ; void RadioStationModel::emitChangeSignals(class RadioStation const &, class QFlags<enum RadioStation::ChangeFlag>)
+ ?tr@RadioStationModel@@SA?AVQString@@PBD0H@Z @ 94 NONAME ; class QString RadioStationModel::tr(char const *, char const *, int)
+ ?hasUrl@RadioStation@@QBE_NXZ @ 95 NONAME ; bool RadioStation::hasUrl(void) const
??1RadioStationModel@@UAE@XZ @ 96 NONAME ; RadioStationModel::~RadioStationModel(void)
?isMuted@RadioUiEngine@@QBE_NXZ @ 97 NONAME ; bool RadioUiEngine::isMuted(void) const
?renameStation@RadioStationModel@@QAEXHABVQString@@@Z @ 98 NONAME ; void RadioStationModel::renameStation(int, class QString const &)
- ?emitItemAdded@RadioHistoryModel@@AAEXXZ @ 99 NONAME ; void RadioHistoryModel::emitItemAdded(void)
- ?currentFrequency@RadioUiEngine@@QBEIXZ @ 100 NONAME ; unsigned int RadioUiEngine::currentFrequency(void) const
+ ?currentFrequency@RadioUiEngine@@QBEIXZ @ 99 NONAME ; unsigned int RadioUiEngine::currentFrequency(void) const
+ ?emitItemAdded@RadioHistoryModel@@AAEXXZ @ 100 NONAME ; void RadioHistoryModel::emitItemAdded(void)
?setUserDefinedName@RadioStation@@QAEXABVQString@@@Z @ 101 NONAME ; void RadioStation::setUserDefinedName(class QString const &)
- ??1RadioStation@@UAE@XZ @ 102 NONAME ; RadioStation::~RadioStation(void)
- ?getStaticMetaObject@RadioScannerEngine@@SAABUQMetaObject@@XZ @ 103 NONAME ; struct QMetaObject const & RadioScannerEngine::getStaticMetaObject(void)
- ?callSignString@RadioStation@@AAE?AVQString@@I@Z @ 104 NONAME ; class QString RadioStation::callSignString(unsigned int)
- ?isValid@RadioStation@@QBE_NXZ @ 105 NONAME ; bool RadioStation::isValid(void) const
- ?decrementReferenceCount@RadioStation@@AAEXXZ @ 106 NONAME ; void RadioStation::decrementReferenceCount(void)
- ?trUtf8@RadioUiEngine@@SA?AVQString@@PBD0H@Z @ 107 NONAME ; class QString RadioUiEngine::trUtf8(char const *, char const *, int)
- ?reset@RadioHistoryItem@@QAEXXZ @ 108 NONAME ; void RadioHistoryItem::reset(void)
- ?trUtf8@RadioStationModel@@SA?AVQString@@PBD0@Z @ 109 NONAME ; class QString RadioStationModel::trUtf8(char const *, char const *)
- ??0RadioStationModel@@QAE@AAVRadioUiEnginePrivate@@@Z @ 110 NONAME ; RadioStationModel::RadioStationModel(class RadioUiEnginePrivate &)
- ?stationDataChanged@RadioStationModel@@IAEXABVRadioStation@@@Z @ 111 NONAME ; void RadioStationModel::stationDataChanged(class RadioStation const &)
- ?frequency@RadioHistoryItem@@QBEIXZ @ 112 NONAME ; unsigned int RadioHistoryItem::frequency(void) const
- ?currentStation@RadioStationModel@@QAEAAVRadioStation@@XZ @ 113 NONAME ; class RadioStation & RadioStationModel::currentStation(void)
- ?isDetached@RadioHistoryItem@@QBE_NXZ @ 114 NONAME ; bool RadioHistoryItem::isDetached(void) const
- ?genre@RadioStation@@QBEHXZ @ 115 NONAME ; int RadioStation::genre(void) const
- ?reset@RadioStation@@QAEXXZ @ 116 NONAME ; void RadioStation::reset(void)
- ?qt_metacall@RadioScannerEngine@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 117 NONAME ; int RadioScannerEngine::qt_metacall(enum QMetaObject::Call, int, void * *)
- ?emitTunedToFrequency@RadioUiEngine@@AAEXIH@Z @ 118 NONAME ; void RadioUiEngine::emitTunedToFrequency(unsigned int, int)
- ??0RadioStation@@QAE@XZ @ 119 NONAME ; RadioStation::RadioStation(void)
- ?psType@RadioStation@@QBE?AV?$QFlags@W4PsTypeFlag@RadioStation@@@@XZ @ 120 NONAME ; class QFlags<enum RadioStation::PsTypeFlag> RadioStation::psType(void) const
- ??1RadioHistoryModel@@UAE@XZ @ 121 NONAME ; RadioHistoryModel::~RadioHistoryModel(void)
- ?d_func@RadioUiEngine@@ABEPBVRadioUiEnginePrivate@@XZ @ 122 NONAME ; class RadioUiEnginePrivate const * RadioUiEngine::d_func(void) const
- ?scannerEngine@RadioUiEngine@@QAEPAVRadioScannerEngine@@XZ @ 123 NONAME ; class RadioScannerEngine * RadioUiEngine::scannerEngine(void)
- ?setManualSeekMode@RadioUiEngine@@QAEX_N@Z @ 124 NONAME ; void RadioUiEngine::setManualSeekMode(bool)
- ?isSongRecognitionAppAvailable@RadioUiEngine@@QAE_NXZ @ 125 NONAME ; bool RadioUiEngine::isSongRecognitionAppAvailable(void)
- ?startScanning@RadioScannerEngine@@QAEXXZ @ 126 NONAME ; void RadioScannerEngine::startScanning(void)
- ?emitStationFound@RadioScannerEngine@@AAEXABVRadioStation@@@Z @ 127 NONAME ; void RadioScannerEngine::emitStationFound(class RadioStation const &)
- ?isValid@RadioHistoryItem@@QBE_NXZ @ 128 NONAME ; bool RadioHistoryItem::isValid(void) const
- ?findCurrentStation@RadioStationModel@@AAE?AVRadioStation@@I@Z @ 129 NONAME ; class RadioStation RadioStationModel::findCurrentStation(unsigned int)
- ?setUrl@RadioStation@@QAEXABVQString@@@Z @ 130 NONAME ; void RadioStation::setUrl(class QString const &)
- ?setFrequency@RadioUiEngine@@QAEXIH@Z @ 131 NONAME ; void RadioUiEngine::setFrequency(unsigned int, int)
- ?data@RadioHistoryModel@@UBE?AVQVariant@@ABVQModelIndex@@H@Z @ 132 NONAME ; class QVariant RadioHistoryModel::data(class QModelIndex const &, int) const
- ??4RadioHistoryItem@@QAEAAV0@ABV0@@Z @ 133 NONAME ; class RadioHistoryItem & RadioHistoryItem::operator=(class RadioHistoryItem const &)
- ?url@RadioStation@@QBE?AVQString@@XZ @ 134 NONAME ; class QString RadioStation::url(void) const
- ?historyModel@RadioUiEngine@@QAEAAVRadioHistoryModel@@XZ @ 135 NONAME ; class RadioHistoryModel & RadioUiEngine::historyModel(void)
- ?emitRdsAvailabilityChanged@RadioUiEngine@@AAEX_N@Z @ 136 NONAME ; void RadioUiEngine::emitRdsAvailabilityChanged(bool)
- ?frequencyMhz@RadioStation@@QBE?AVQString@@XZ @ 137 NONAME ; class QString RadioStation::frequencyMhz(void) const
- ?isAntennaAttached@RadioUiEngine@@QBE_NXZ @ 138 NONAME ; bool RadioUiEngine::isAntennaAttached(void) const
- ?setStation@RadioHistoryItem@@QAEXABVQString@@@Z @ 139 NONAME ; void RadioHistoryItem::setStation(class QString const &)
- ?qt_metacast@RadioStationModel@@UAEPAXPBD@Z @ 140 NONAME ; void * RadioStationModel::qt_metacast(char const *)
- ?presetIndex@RadioStation@@QBEHXZ @ 141 NONAME ; int RadioStation::presetIndex(void) const
- ?cancel@RadioScannerEngine@@QAEXXZ @ 142 NONAME ; void RadioScannerEngine::cancel(void)
- ?staticMetaObject@RadioStationModel@@2UQMetaObject@@B @ 143 NONAME ; struct QMetaObject const RadioStationModel::staticMetaObject
- ?addRecognizedSong@RadioUiEngine@@QAEXABVQString@@0ABVRadioStation@@@Z @ 144 NONAME ; void RadioUiEngine::addRecognizedSong(class QString const &, class QString const &, class RadioStation const &)
- ?emitMuteChanged@RadioUiEngine@@AAEX_N@Z @ 145 NONAME ; void RadioUiEngine::emitMuteChanged(bool)
- ?currentSongReset@RadioHistoryModel@@IAEXXZ @ 146 NONAME ; void RadioHistoryModel::currentSongReset(void)
- ?removeByPresetIndex@RadioStationModel@@QAEXH@Z @ 147 NONAME ; void RadioStationModel::removeByPresetIndex(int)
- ?d_func@RadioScannerEngine@@AAEPAVRadioScannerEnginePrivate@@XZ @ 148 NONAME ; class RadioScannerEnginePrivate * RadioScannerEngine::d_func(void)
- ?setFrequency@RadioStation@@QAEXI@Z @ 149 NONAME ; void RadioStation::setFrequency(unsigned int)
- ?isRenamed@RadioStation@@QBE_NXZ @ 150 NONAME ; bool RadioStation::isRenamed(void) const
- ?stationAt@RadioStationModel@@QBE?AVRadioStation@@H@Z @ 151 NONAME ; class RadioStation RadioStationModel::stationAt(int) const
- ?removeStation@RadioStationModel@@QAEXABVRadioStation@@@Z @ 152 NONAME ; void RadioStationModel::removeStation(class RadioStation const &)
- ?openMusicStore@RadioUiEngine@@QAEXABVRadioHistoryItem@@W4MusicStore@1@@Z @ 153 NONAME ; void RadioUiEngine::openMusicStore(class RadioHistoryItem const &, enum RadioUiEngine::MusicStore)
- ?metaObject@RadioUiEngine@@UBEPBUQMetaObject@@XZ @ 154 NONAME ; struct QMetaObject const * RadioUiEngine::metaObject(void) const
- ?dynamicPsChanged@RadioStationModel@@IAEXABVRadioStation@@@Z @ 155 NONAME ; void RadioStationModel::dynamicPsChanged(class RadioStation const &)
- ?setType@RadioStation@@QAEXV?$QFlags@W4TypeFlag@RadioStation@@@@@Z @ 156 NONAME ; void RadioStation::setType(class QFlags<enum RadioStation::TypeFlag>)
- ??0RadioHistoryItem@@QAE@XZ @ 157 NONAME ; RadioHistoryItem::RadioHistoryItem(void)
- ?removeByFrequency@RadioStationModel@@QAEXI@Z @ 158 NONAME ; void RadioStationModel::removeByFrequency(unsigned int)
- ?isUsingLoudspeaker@RadioUiEngine@@QBE_NXZ @ 159 NONAME ; bool RadioUiEngine::isUsingLoudspeaker(void) const
- ?findFrequency@RadioStationModel@@QBE_NIAAVRadioStation@@@Z @ 160 NONAME ; bool RadioStationModel::findFrequency(unsigned int, class RadioStation &) const
- ?findPresetIndex@RadioStationModel@@QAEHH@Z @ 161 NONAME ; int RadioStationModel::findPresetIndex(int)
- ?setRadioTextPlus@RadioStation@@QAEXHABVQString@@@Z @ 162 NONAME ; void RadioStation::setRadioTextPlus(int, class QString const &)
+ ?setUrl@RadioStation@@AAEXABVQString@@@Z @ 102 NONAME ; void RadioStation::setUrl(class QString const &)
+ ?hasDynamicPs@RadioStation@@QBE_NXZ @ 103 NONAME ; bool RadioStation::hasDynamicPs(void) const
+ ??1RadioStation@@UAE@XZ @ 104 NONAME ; RadioStation::~RadioStation(void)
+ ?getStaticMetaObject@RadioScannerEngine@@SAABUQMetaObject@@XZ @ 105 NONAME ; struct QMetaObject const & RadioScannerEngine::getStaticMetaObject(void)
+ ?callSignString@RadioStation@@AAE?AVQString@@I@Z @ 106 NONAME ; class QString RadioStation::callSignString(unsigned int)
+ ?isValid@RadioStation@@QBE_NXZ @ 107 NONAME ; bool RadioStation::isValid(void) const
+ ?data_ptr@RadioStation@@QAEAAV?$QSharedDataPointer@VRadioStationPrivate@@@@XZ @ 108 NONAME ; class QSharedDataPointer<class RadioStationPrivate> & RadioStation::data_ptr(void)
+ ?trUtf8@RadioUiEngine@@SA?AVQString@@PBD0H@Z @ 109 NONAME ; class QString RadioUiEngine::trUtf8(char const *, char const *, int)
+ ?reset@RadioHistoryItem@@QAEXXZ @ 110 NONAME ; void RadioHistoryItem::reset(void)
+ ?trUtf8@RadioStationModel@@SA?AVQString@@PBD0@Z @ 111 NONAME ; class QString RadioStationModel::trUtf8(char const *, char const *)
+ ?setRadioTextPlus@RadioStation@@AAEXHABVQString@@@Z @ 112 NONAME ; void RadioStation::setRadioTextPlus(int, class QString const &)
+ ?setChangeFlags@RadioStation@@AAEXV?$QFlags@W4ChangeFlag@RadioStation@@@@@Z @ 113 NONAME ; void RadioStation::setChangeFlags(class QFlags<enum RadioStation::ChangeFlag>)
+ ??0RadioStationModel@@QAE@AAVRadioUiEnginePrivate@@@Z @ 114 NONAME ; RadioStationModel::RadioStationModel(class RadioUiEnginePrivate &)
+ ?stationDataChanged@RadioStationModel@@IAEXABVRadioStation@@@Z @ 115 NONAME ; void RadioStationModel::stationDataChanged(class RadioStation const &)
+ ?frequency@RadioHistoryItem@@QBEIXZ @ 116 NONAME ; unsigned int RadioHistoryItem::frequency(void) const
+ ?currentStation@RadioStationModel@@QAEAAVRadioStation@@XZ @ 117 NONAME ; class RadioStation & RadioStationModel::currentStation(void)
+ ?isDetached@RadioHistoryItem@@QBE_NXZ @ 118 NONAME ; bool RadioHistoryItem::isDetached(void) const
+ ?genre@RadioStation@@QBEHXZ @ 119 NONAME ; int RadioStation::genre(void) const
+ ?qt_metacall@RadioScannerEngine@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 120 NONAME ; int RadioScannerEngine::qt_metacall(enum QMetaObject::Call, int, void * *)
+ ?emitTunedToFrequency@RadioUiEngine@@AAEXIH@Z @ 121 NONAME ; void RadioUiEngine::emitTunedToFrequency(unsigned int, int)
+ ??0RadioStation@@QAE@XZ @ 122 NONAME ; RadioStation::RadioStation(void)
+ ?psType@RadioStation@@QBE?AV?$QFlags@W4PsTypeFlag@RadioStation@@@@XZ @ 123 NONAME ; class QFlags<enum RadioStation::PsTypeFlag> RadioStation::psType(void) const
+ ??1RadioHistoryModel@@UAE@XZ @ 124 NONAME ; RadioHistoryModel::~RadioHistoryModel(void)
+ ?d_func@RadioUiEngine@@ABEPBVRadioUiEnginePrivate@@XZ @ 125 NONAME ; class RadioUiEnginePrivate const * RadioUiEngine::d_func(void) const
+ ?findStation@RadioStationModel@@QBE?AVRadioStation@@IW4Criteria@FindCriteria@@@Z @ 126 NONAME ; class RadioStation RadioStationModel::findStation(unsigned int, enum FindCriteria::Criteria) const
+ ?scannerEngine@RadioUiEngine@@QAEPAVRadioScannerEngine@@XZ @ 127 NONAME ; class RadioScannerEngine * RadioUiEngine::scannerEngine(void)
+ ?setManualSeekMode@RadioUiEngine@@QAEX_N@Z @ 128 NONAME ; void RadioUiEngine::setManualSeekMode(bool)
+ ?isSongRecognitionAppAvailable@RadioUiEngine@@QAE_NXZ @ 129 NONAME ; bool RadioUiEngine::isSongRecognitionAppAvailable(void)
+ ?startScanning@RadioScannerEngine@@QAEXXZ @ 130 NONAME ; void RadioScannerEngine::startScanning(void)
+ ?emitStationFound@RadioScannerEngine@@AAEXABVRadioStation@@@Z @ 131 NONAME ; void RadioScannerEngine::emitStationFound(class RadioStation const &)
+ ?isValid@RadioHistoryItem@@QBE_NXZ @ 132 NONAME ; bool RadioHistoryItem::isValid(void) const
+ ?setPsType@RadioStation@@AAEXV?$QFlags@W4PsTypeFlag@RadioStation@@@@@Z @ 133 NONAME ; void RadioStation::setPsType(class QFlags<enum RadioStation::PsTypeFlag>)
+ ?setFrequency@RadioUiEngine@@QAEXIH@Z @ 134 NONAME ; void RadioUiEngine::setFrequency(unsigned int, int)
+ ?data@RadioHistoryModel@@UBE?AVQVariant@@ABVQModelIndex@@H@Z @ 135 NONAME ; class QVariant RadioHistoryModel::data(class QModelIndex const &, int) const
+ ??4RadioHistoryItem@@QAEAAV0@ABV0@@Z @ 136 NONAME ; class RadioHistoryItem & RadioHistoryItem::operator=(class RadioHistoryItem const &)
+ ?url@RadioStation@@QBE?AVQString@@XZ @ 137 NONAME ; class QString RadioStation::url(void) const
+ ?historyModel@RadioUiEngine@@QAEAAVRadioHistoryModel@@XZ @ 138 NONAME ; class RadioHistoryModel & RadioUiEngine::historyModel(void)
+ ?emitRdsAvailabilityChanged@RadioUiEngine@@AAEX_N@Z @ 139 NONAME ; void RadioUiEngine::emitRdsAvailabilityChanged(bool)
+ ?isAntennaAttached@RadioUiEngine@@QBE_NXZ @ 140 NONAME ; bool RadioUiEngine::isAntennaAttached(void) const
+ ?setStation@RadioHistoryItem@@QAEXABVQString@@@Z @ 141 NONAME ; void RadioHistoryItem::setStation(class QString const &)
+ ?qt_metacast@RadioStationModel@@UAEPAXPBD@Z @ 142 NONAME ; void * RadioStationModel::qt_metacast(char const *)
+ ?presetIndex@RadioStation@@QBEHXZ @ 143 NONAME ; int RadioStation::presetIndex(void) const
+ ?cancel@RadioScannerEngine@@QAEXXZ @ 144 NONAME ; void RadioScannerEngine::cancel(void)
+ ?staticMetaObject@RadioStationModel@@2UQMetaObject@@B @ 145 NONAME ; struct QMetaObject const RadioStationModel::staticMetaObject
+ ?addRecognizedSong@RadioUiEngine@@QAEXABVQString@@0ABVRadioStation@@@Z @ 146 NONAME ; void RadioUiEngine::addRecognizedSong(class QString const &, class QString const &, class RadioStation const &)
+ ?emitMuteChanged@RadioUiEngine@@AAEX_N@Z @ 147 NONAME ; void RadioUiEngine::emitMuteChanged(bool)
+ ?setDynamicPsText@RadioStation@@AAEXABVQString@@@Z @ 148 NONAME ; void RadioStation::setDynamicPsText(class QString const &)
+ ?currentSongReset@RadioHistoryModel@@IAEXXZ @ 149 NONAME ; void RadioHistoryModel::currentSongReset(void)
+ ?removeByPresetIndex@RadioStationModel@@QAEXH@Z @ 150 NONAME ; void RadioStationModel::removeByPresetIndex(int)
+ ?d_func@RadioScannerEngine@@AAEPAVRadioScannerEnginePrivate@@XZ @ 151 NONAME ; class RadioScannerEnginePrivate * RadioScannerEngine::d_func(void)
+ ?isRenamed@RadioStation@@QBE_NXZ @ 152 NONAME ; bool RadioStation::isRenamed(void) const
+ ?stationAt@RadioStationModel@@QBE?AVRadioStation@@H@Z @ 153 NONAME ; class RadioStation RadioStationModel::stationAt(int) const
+ ?removeStation@RadioStationModel@@QAEXABVRadioStation@@@Z @ 154 NONAME ; void RadioStationModel::removeStation(class RadioStation const &)
+ ?openMusicStore@RadioUiEngine@@QAEXABVRadioHistoryItem@@W4MusicStore@1@@Z @ 155 NONAME ; void RadioUiEngine::openMusicStore(class RadioHistoryItem const &, enum RadioUiEngine::MusicStore)
+ ?metaObject@RadioUiEngine@@UBEPBUQMetaObject@@XZ @ 156 NONAME ; struct QMetaObject const * RadioUiEngine::metaObject(void) const
+ ?dynamicPsChanged@RadioStationModel@@IAEXABVRadioStation@@@Z @ 157 NONAME ; void RadioStationModel::dynamicPsChanged(class RadioStation const &)
+ ?setType@RadioStation@@QAEXV?$QFlags@W4TypeFlag@RadioStation@@@@@Z @ 158 NONAME ; void RadioStation::setType(class QFlags<enum RadioStation::TypeFlag>)
+ ??0RadioHistoryItem@@QAE@XZ @ 159 NONAME ; RadioHistoryItem::RadioHistoryItem(void)
+ ?removeByFrequency@RadioStationModel@@QAEXI@Z @ 160 NONAME ; void RadioStationModel::removeByFrequency(unsigned int)
+ ?isUsingLoudspeaker@RadioUiEngine@@QBE_NXZ @ 161 NONAME ; bool RadioUiEngine::isUsingLoudspeaker(void) const
+ ?findPresetIndex@RadioStationModel@@QAEHH@Z @ 162 NONAME ; int RadioStationModel::findPresetIndex(int)
??0RadioHistoryItem@@QAE@ABV0@@Z @ 163 NONAME ; RadioHistoryItem::RadioHistoryItem(class RadioHistoryItem const &)
?metaObject@RadioStationModel@@UBEPBUQMetaObject@@XZ @ 164 NONAME ; struct QMetaObject const * RadioStationModel::metaObject(void) const
?getStaticMetaObject@RadioStationModel@@SAABUQMetaObject@@XZ @ 165 NONAME ; struct QMetaObject const & RadioStationModel::getStaticMetaObject(void)
?isPoweringOff@RadioUiEngine@@QBE_NXZ @ 166 NONAME ; bool RadioUiEngine::isPoweringOff(void) const
- ?tr@RadioScannerEngine@@SA?AVQString@@PBD0@Z @ 167 NONAME ; class QString RadioScannerEngine::tr(char const *, char const *)
- ?removeAll@RadioHistoryModel@@QAEX_N@Z @ 168 NONAME ; void RadioHistoryModel::removeAll(bool)
- ?audioRouteChanged@RadioUiEngine@@IAEX_N@Z @ 169 NONAME ; void RadioUiEngine::audioRouteChanged(bool)
- ?setPowerOn@RadioUiEngine@@QAEXXZ @ 170 NONAME ; void RadioUiEngine::setPowerOn(void)
- ?tr@RadioHistoryModel@@SA?AVQString@@PBD0H@Z @ 171 NONAME ; class QString RadioHistoryModel::tr(char const *, char const *, int)
- ?dynamicPsText@RadioStation@@QBE?AVQString@@XZ @ 172 NONAME ; class QString RadioStation::dynamicPsText(void) const
- ?isFirstTimeStart@RadioUiEngine@@QAE_NXZ @ 173 NONAME ; bool RadioUiEngine::isFirstTimeStart(void)
- ?setMute@RadioUiEngine@@QAEX_N@Z @ 174 NONAME ; void RadioUiEngine::setMute(bool)
- ?createScannerEngine@RadioUiEngine@@QAEPAVRadioScannerEngine@@XZ @ 175 NONAME ; class RadioScannerEngine * RadioUiEngine::createScannerEngine(void)
- ??0RadioScannerEngine@@QAE@AAVRadioUiEnginePrivate@@@Z @ 176 NONAME ; RadioScannerEngine::RadioScannerEngine(class RadioUiEnginePrivate &)
- ?emitRadioStatusChanged@RadioUiEngine@@AAEX_N@Z @ 177 NONAME ; void RadioUiEngine::emitRadioStatusChanged(bool)
- ??_ERadioUiEngine@@UAE@I@Z @ 178 NONAME ; RadioUiEngine::~RadioUiEngine(unsigned int)
- ?init@RadioUiEngine@@QAE_NXZ @ 179 NONAME ; bool RadioUiEngine::init(void)
- ?setDynamicPsText@RadioStation@@QAEXABVQString@@@Z @ 180 NONAME ; void RadioStation::setDynamicPsText(class QString const &)
- ?changeFlags@RadioStation@@QBE?AV?$QFlags@W4ChangeFlag@RadioStation@@@@XZ @ 181 NONAME ; class QFlags<enum RadioStation::ChangeFlag> RadioStation::changeFlags(void) const
- ?d_func@RadioStationModel@@AAEPAVRadioStationModelPrivate@@XZ @ 182 NONAME ; class RadioStationModelPrivate * RadioStationModel::d_func(void)
- ?addRadioTextPlus@RadioHistoryModel@@AAEXHABVQString@@ABVRadioStation@@@Z @ 183 NONAME ; void RadioHistoryModel::addRadioTextPlus(int, class QString const &, class RadioStation const &)
- ?qt_metacast@RadioHistoryModel@@UAEPAXPBD@Z @ 184 NONAME ; void * RadioHistoryModel::qt_metacast(char const *)
- ?nameOrFrequencyMhz@RadioStation@@QBE?AVQString@@XZ @ 185 NONAME ; class QString RadioStation::nameOrFrequencyMhz(void) const
- ?setDetail@RadioStationModel@@QAEXV?$QFlags@W4DetailFlag@RadioStationModel@@@@@Z @ 186 NONAME ; void RadioStationModel::setDetail(class QFlags<enum RadioStationModel::DetailFlag>)
- ??1RadioUiEngine@@UAE@XZ @ 187 NONAME ; RadioUiEngine::~RadioUiEngine(void)
- ?tr@RadioHistoryModel@@SA?AVQString@@PBD0@Z @ 188 NONAME ; class QString RadioHistoryModel::tr(char const *, char const *)
- ?time@RadioHistoryItem@@QBE?AVQString@@XZ @ 189 NONAME ; class QString RadioHistoryItem::time(void) const
- ?reportChangedData@RadioHistoryModel@@AAEXHH@Z @ 190 NONAME ; void RadioHistoryModel::reportChangedData(int, int)
- ?artist@RadioHistoryItem@@QBE?AVQString@@XZ @ 191 NONAME ; class QString RadioHistoryItem::artist(void) const
- ?initialize@RadioStationModel@@QAEXPAVRadioPresetStorage@@PAVRadioEngineWrapper@@@Z @ 192 NONAME ; void RadioStationModel::initialize(class RadioPresetStorage *, class RadioEngineWrapper *)
- ?isType@RadioStation@@QBE_NV?$QFlags@W4TypeFlag@RadioStation@@@@@Z @ 193 NONAME ; bool RadioStation::isType(class QFlags<enum RadioStation::TypeFlag>) const
- ?resetCurrentSong@RadioHistoryModel@@QAEXXZ @ 194 NONAME ; void RadioHistoryModel::resetCurrentSong(void)
- ?d_func@RadioHistoryModel@@ABEPBVRadioHistoryModelPrivate@@XZ @ 195 NONAME ; class RadioHistoryModelPrivate const * RadioHistoryModel::d_func(void) const
- ?volumeChanged@RadioUiEngine@@IAEXH@Z @ 196 NONAME ; void RadioUiEngine::volumeChanged(int)
- ?title@RadioHistoryItem@@QBE?AVQString@@XZ @ 197 NONAME ; class QString RadioHistoryItem::title(void) const
- ?stationFound@RadioScannerEngine@@IAEXABVRadioStation@@@Z @ 198 NONAME ; void RadioScannerEngine::stationFound(class RadioStation const &)
- ?resetChangeFlags@RadioStation@@QAEXXZ @ 199 NONAME ; void RadioStation::resetChangeFlags(void)
- ?data_ptr@RadioStation@@QAEAAPAVRadioStationPrivate@@XZ @ 200 NONAME ; class RadioStationPrivate * & RadioStation::data_ptr(void)
- ?powerOffRequested@RadioUiEngine@@IAEXXZ @ 201 NONAME ; void RadioUiEngine::powerOffRequested(void)
- ?metaObject@RadioScannerEngine@@UBEPBUQMetaObject@@XZ @ 202 NONAME ; struct QMetaObject const * RadioScannerEngine::metaObject(void) const
- ?qt_metacast@RadioScannerEngine@@UAEPAXPBD@Z @ 203 NONAME ; void * RadioScannerEngine::qt_metacast(char const *)
- ?callSignChar@RadioStation@@AAEDI@Z @ 204 NONAME ; char RadioStation::callSignChar(unsigned int)
- ??_ERadioStation@@UAE@I@Z @ 205 NONAME ; RadioStation::~RadioStation(unsigned int)
- ??1RadioHistoryItem@@UAE@XZ @ 206 NONAME ; RadioHistoryItem::~RadioHistoryItem(void)
- ?detach@RadioHistoryItem@@QAEXXZ @ 207 NONAME ; void RadioHistoryItem::detach(void)
- ?antennaStatusChanged@RadioUiEngine@@IAEX_N@Z @ 208 NONAME ; void RadioUiEngine::antennaStatusChanged(bool)
- ?staticMetaObject@RadioHistoryModel@@2UQMetaObject@@B @ 209 NONAME ; struct QMetaObject const RadioHistoryModel::staticMetaObject
- ?setFirstTimeStartPerformed@RadioUiEngine@@QAEX_N@Z @ 210 NONAME ; void RadioUiEngine::setFirstTimeStartPerformed(bool)
+ ?lastTunedFrequency@RadioUiEngine@@SAII@Z @ 167 NONAME ; unsigned int RadioUiEngine::lastTunedFrequency(unsigned int)
+ ?tr@RadioScannerEngine@@SA?AVQString@@PBD0@Z @ 168 NONAME ; class QString RadioScannerEngine::tr(char const *, char const *)
+ ?removeAll@RadioHistoryModel@@QAEX_N@Z @ 169 NONAME ; void RadioHistoryModel::removeAll(bool)
+ ?hasGenre@RadioStation@@QBE_NXZ @ 170 NONAME ; bool RadioStation::hasGenre(void) const
+ ?audioRouteChanged@RadioUiEngine@@IAEX_N@Z @ 171 NONAME ; void RadioUiEngine::audioRouteChanged(bool)
+ ?setPowerOn@RadioUiEngine@@QAEXXZ @ 172 NONAME ; void RadioUiEngine::setPowerOn(void)
+ ?tr@RadioHistoryModel@@SA?AVQString@@PBD0H@Z @ 173 NONAME ; class QString RadioHistoryModel::tr(char const *, char const *, int)
+ ?dynamicPsText@RadioStation@@QBE?AVQString@@XZ @ 174 NONAME ; class QString RadioStation::dynamicPsText(void) const
+ ?isFirstTimeStart@RadioUiEngine@@QAE_NXZ @ 175 NONAME ; bool RadioUiEngine::isFirstTimeStart(void)
+ ?setMute@RadioUiEngine@@QAEX_N@Z @ 176 NONAME ; void RadioUiEngine::setMute(bool)
+ ?setGenre@RadioStation@@AAEXH@Z @ 177 NONAME ; void RadioStation::setGenre(int)
+ ??0RadioScannerEngine@@QAE@AAVRadioUiEnginePrivate@@@Z @ 178 NONAME ; RadioScannerEngine::RadioScannerEngine(class RadioUiEnginePrivate &)
+ ?emitRadioStatusChanged@RadioUiEngine@@AAEX_N@Z @ 179 NONAME ; void RadioUiEngine::emitRadioStatusChanged(bool)
+ ??_ERadioUiEngine@@UAE@I@Z @ 180 NONAME ; RadioUiEngine::~RadioUiEngine(unsigned int)
+ ?init@RadioUiEngine@@QAE_NXZ @ 181 NONAME ; bool RadioUiEngine::init(void)
+ ?setRadioText@RadioStation@@AAEXABVQString@@@Z @ 182 NONAME ; void RadioStation::setRadioText(class QString const &)
+ ?changeFlags@RadioStation@@QBE?AV?$QFlags@W4ChangeFlag@RadioStation@@@@XZ @ 183 NONAME ; class QFlags<enum RadioStation::ChangeFlag> RadioStation::changeFlags(void) const
+ ?findFrequency@RadioStationModel@@QBE_NIAAVRadioStation@@W4Criteria@FindCriteria@@@Z @ 184 NONAME ; bool RadioStationModel::findFrequency(unsigned int, class RadioStation &, enum FindCriteria::Criteria) const
+ ?d_func@RadioStationModel@@AAEPAVRadioStationModelPrivate@@XZ @ 185 NONAME ; class RadioStationModelPrivate * RadioStationModel::d_func(void)
+ ?addRadioTextPlus@RadioHistoryModel@@AAEXHABVQString@@ABVRadioStation@@@Z @ 186 NONAME ; void RadioHistoryModel::addRadioTextPlus(int, class QString const &, class RadioStation const &)
+ ?qt_metacast@RadioHistoryModel@@UAEPAXPBD@Z @ 187 NONAME ; void * RadioHistoryModel::qt_metacast(char const *)
+ ?setDetail@RadioStationModel@@QAEXV?$QFlags@W4DetailFlag@RadioStationModel@@@@@Z @ 188 NONAME ; void RadioStationModel::setDetail(class QFlags<enum RadioStationModel::DetailFlag>)
+ ??1RadioUiEngine@@UAE@XZ @ 189 NONAME ; RadioUiEngine::~RadioUiEngine(void)
+ ?tr@RadioHistoryModel@@SA?AVQString@@PBD0@Z @ 190 NONAME ; class QString RadioHistoryModel::tr(char const *, char const *)
+ ?time@RadioHistoryItem@@QBE?AVQString@@XZ @ 191 NONAME ; class QString RadioHistoryItem::time(void) const
+ ?reportChangedData@RadioHistoryModel@@AAEXHH@Z @ 192 NONAME ; void RadioHistoryModel::reportChangedData(int, int)
+ ?artist@RadioHistoryItem@@QBE?AVQString@@XZ @ 193 NONAME ; class QString RadioHistoryItem::artist(void) const
+ ?initialize@RadioStationModel@@QAEXPAVRadioPresetStorage@@PAVRadioEngineWrapper@@@Z @ 194 NONAME ; void RadioStationModel::initialize(class RadioPresetStorage *, class RadioEngineWrapper *)
+ ?isType@RadioStation@@QBE_NV?$QFlags@W4TypeFlag@RadioStation@@@@@Z @ 195 NONAME ; bool RadioStation::isType(class QFlags<enum RadioStation::TypeFlag>) const
+ ?resetCurrentSong@RadioHistoryModel@@QAEXXZ @ 196 NONAME ; void RadioHistoryModel::resetCurrentSong(void)
+ ?d_func@RadioHistoryModel@@ABEPBVRadioHistoryModelPrivate@@XZ @ 197 NONAME ; class RadioHistoryModelPrivate const * RadioHistoryModel::d_func(void) const
+ ?volumeChanged@RadioUiEngine@@IAEXH@Z @ 198 NONAME ; void RadioUiEngine::volumeChanged(int)
+ ?title@RadioHistoryItem@@QBE?AVQString@@XZ @ 199 NONAME ; class QString RadioHistoryItem::title(void) const
+ ?stationFound@RadioScannerEngine@@IAEXABVRadioStation@@@Z @ 200 NONAME ; void RadioScannerEngine::stationFound(class RadioStation const &)
+ ?resetChangeFlags@RadioStation@@QAEXXZ @ 201 NONAME ; void RadioStation::resetChangeFlags(void)
+ ?powerOffRequested@RadioUiEngine@@IAEXXZ @ 202 NONAME ; void RadioUiEngine::powerOffRequested(void)
+ ?metaObject@RadioScannerEngine@@UBEPBUQMetaObject@@XZ @ 203 NONAME ; struct QMetaObject const * RadioScannerEngine::metaObject(void) const
+ ?qt_metacast@RadioScannerEngine@@UAEPAXPBD@Z @ 204 NONAME ; void * RadioScannerEngine::qt_metacast(char const *)
+ ?callSignChar@RadioStation@@AAEDI@Z @ 205 NONAME ; char RadioStation::callSignChar(unsigned int)
+ ??_ERadioStation@@UAE@I@Z @ 206 NONAME ; RadioStation::~RadioStation(unsigned int)
+ ?antennaStatusChanged@RadioUiEngine@@IAEX_N@Z @ 207 NONAME ; void RadioUiEngine::antennaStatusChanged(bool)
+ ?staticMetaObject@RadioHistoryModel@@2UQMetaObject@@B @ 208 NONAME ; struct QMetaObject const RadioHistoryModel::staticMetaObject
+ ?setFirstTimeStartPerformed@RadioUiEngine@@QAEX_N@Z @ 209 NONAME ; void RadioUiEngine::setFirstTimeStartPerformed(bool)
+ ??0RadioStation@@AAE@HI@Z @ 210 NONAME ; RadioStation::RadioStation(int, unsigned int)
?qt_metacall@RadioStationModel@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 211 NONAME ; int RadioStationModel::qt_metacall(enum QMetaObject::Call, int, void * *)
?isDetached@RadioStation@@QBE_NXZ @ 212 NONAME ; bool RadioStation::isDetached(void) const
- ?setRadioText@RadioStation@@QAEXABVQString@@@Z @ 213 NONAME ; void RadioStation::setRadioText(class QString const &)
- ??0RadioHistoryItem@@QAE@ABVQString@@0@Z @ 214 NONAME ; RadioHistoryItem::RadioHistoryItem(class QString const &, class QString const &)
- ?name@RadioStation@@QBE?AVQString@@XZ @ 215 NONAME ; class QString RadioStation::name(void) const
- ?hasDataChanged@RadioStation@@QBE_NV?$QFlags@W4ChangeFlag@RadioStation@@@@@Z @ 216 NONAME ; bool RadioStation::hasDataChanged(class QFlags<enum RadioStation::ChangeFlag>) const
- ?removeAll@RadioStationModel@@QAEXW4RemoveMode@1@@Z @ 217 NONAME ; void RadioStationModel::removeAll(enum RadioStationModel::RemoveMode)
- ?data@RadioStationModel@@UBE?AVQVariant@@ABVQModelIndex@@H@Z @ 218 NONAME ; class QVariant RadioStationModel::data(class QModelIndex const &, int) const
- ?itemAdded@RadioHistoryModel@@IAEXXZ @ 219 NONAME ; void RadioHistoryModel::itemAdded(void)
- ?data_ptr@RadioHistoryItem@@QAEAAPAVRadioHistoryItemPrivate@@XZ @ 220 NONAME ; class RadioHistoryItemPrivate * & RadioHistoryItem::data_ptr(void)
- ?getStaticMetaObject@RadioUiEngine@@SAABUQMetaObject@@XZ @ 221 NONAME ; struct QMetaObject const & RadioUiEngine::getStaticMetaObject(void)
- ?setShowDetails@RadioHistoryModel@@QAEX_N@Z @ 222 NONAME ; void RadioHistoryModel::setShowDetails(bool)
- ?launchSongRecognition@RadioUiEngine@@QAEXXZ @ 223 NONAME ; void RadioUiEngine::launchSongRecognition(void)
- ?rowCount@RadioStationModel@@UBEHABVQModelIndex@@@Z @ 224 NONAME ; int RadioStationModel::rowCount(class QModelIndex const &) const
- ?iterateCallSign@RadioStation@@AAE?AVQString@@HH@Z @ 225 NONAME ; class QString RadioStation::iterateCallSign(int, int)
- ?toggleMute@RadioUiEngine@@QAEXXZ @ 226 NONAME ; void RadioUiEngine::toggleMute(void)
- ?genreToString@RadioUiEngine@@QAE?AVQString@@HW4Target@GenreTarget@@@Z @ 227 NONAME ; class QString RadioUiEngine::genreToString(int, enum GenreTarget::Target)
- ??0RadioUiEngine@@QAE@PAVQObject@@@Z @ 228 NONAME ; RadioUiEngine::RadioUiEngine(class QObject *)
+ ??0RadioHistoryItem@@QAE@ABVQString@@0@Z @ 213 NONAME ; RadioHistoryItem::RadioHistoryItem(class QString const &, class QString const &)
+ ?name@RadioStation@@QBE?AVQString@@XZ @ 214 NONAME ; class QString RadioStation::name(void) const
+ ?hasDataChanged@RadioStation@@QBE_NV?$QFlags@W4ChangeFlag@RadioStation@@@@@Z @ 215 NONAME ; bool RadioStation::hasDataChanged(class QFlags<enum RadioStation::ChangeFlag>) const
+ ?removeAll@RadioStationModel@@QAEXW4RemoveMode@1@@Z @ 216 NONAME ; void RadioStationModel::removeAll(enum RadioStationModel::RemoveMode)
+ ?data@RadioStationModel@@UBE?AVQVariant@@ABVQModelIndex@@H@Z @ 217 NONAME ; class QVariant RadioStationModel::data(class QModelIndex const &, int) const
+ ?itemAdded@RadioHistoryModel@@IAEXXZ @ 218 NONAME ; void RadioHistoryModel::itemAdded(void)
+ ?getStaticMetaObject@RadioUiEngine@@SAABUQMetaObject@@XZ @ 219 NONAME ; struct QMetaObject const & RadioUiEngine::getStaticMetaObject(void)
+ ?setShowDetails@RadioHistoryModel@@QAEX_N@Z @ 220 NONAME ; void RadioHistoryModel::setShowDetails(bool)
+ ?launchSongRecognition@RadioUiEngine@@QAEXXZ @ 221 NONAME ; void RadioUiEngine::launchSongRecognition(void)
+ ?rowCount@RadioStationModel@@UBEHABVQModelIndex@@@Z @ 222 NONAME ; int RadioStationModel::rowCount(class QModelIndex const &) const
+ ?iterateCallSign@RadioStation@@AAE?AVQString@@HH@Z @ 223 NONAME ; class QString RadioStation::iterateCallSign(int, int)
+ ?toggleMute@RadioUiEngine@@QAEXXZ @ 224 NONAME ; void RadioUiEngine::toggleMute(void)
+ ?piCode@RadioStation@@QBEHXZ @ 225 NONAME ; int RadioStation::piCode(void) const
+ ?genreToString@RadioUiEngine@@QAE?AVQString@@HW4Target@GenreTarget@@@Z @ 226 NONAME ; class QString RadioUiEngine::genreToString(int, enum GenreTarget::Target)
+ ??0RadioUiEngine@@QAE@PAVQObject@@@Z @ 227 NONAME ; RadioUiEngine::RadioUiEngine(class QObject *)
+ ?hasRadiotext@RadioStation@@QBE_NXZ @ 228 NONAME ; bool RadioStation::hasRadiotext(void) const
?setCurrentTime@RadioHistoryItem@@QAEXXZ @ 229 NONAME ; void RadioHistoryItem::setCurrentTime(void)
?d_func@RadioUiEngine@@AAEPAVRadioUiEnginePrivate@@XZ @ 230 NONAME ; class RadioUiEnginePrivate * RadioUiEngine::d_func(void)
?station@RadioHistoryItem@@QBE?AVQString@@XZ @ 231 NONAME ; class QString RadioHistoryItem::station(void) const
@@ -235,18 +235,21 @@
?isTagged@RadioHistoryItem@@QBE_NXZ @ 234 NONAME ; bool RadioHistoryItem::isTagged(void) const
?addScannedFrequency@RadioScannerEngine@@QAEXI@Z @ 235 NONAME ; void RadioScannerEngine::addScannedFrequency(unsigned int)
?setShowTagged@RadioHistoryModel@@QAEX_N@Z @ 236 NONAME ; void RadioHistoryModel::setShowTagged(bool)
- ?trUtf8@RadioHistoryModel@@SA?AVQString@@PBD0@Z @ 237 NONAME ; class QString RadioHistoryModel::trUtf8(char const *, char const *)
- ?frequencyStepSize@RadioUiEngine@@QBEIXZ @ 238 NONAME ; unsigned int RadioUiEngine::frequencyStepSize(void) const
- ??0RadioHistoryModel@@AAE@AAVRadioUiEngine@@@Z @ 239 NONAME ; RadioHistoryModel::RadioHistoryModel(class RadioUiEngine &)
- ?trUtf8@RadioStationModel@@SA?AVQString@@PBD0H@Z @ 240 NONAME ; class QString RadioStationModel::trUtf8(char const *, char const *, int)
- ?radioTextReceived@RadioStationModel@@IAEXABVRadioStation@@@Z @ 241 NONAME ; void RadioStationModel::radioTextReceived(class RadioStation const &)
- ?isFavorite@RadioStation@@QBE_NXZ @ 242 NONAME ; bool RadioStation::isFavorite(void) const
- ?metaObject@RadioHistoryModel@@UBEPBUQMetaObject@@XZ @ 243 NONAME ; struct QMetaObject const * RadioHistoryModel::metaObject(void) const
- ?seekingStarted@RadioUiEngine@@IAEXH@Z @ 244 NONAME ; void RadioUiEngine::seekingStarted(int)
- ?emitSeekingStarted@RadioUiEngine@@AAEXW4Direction@Seek@@@Z @ 245 NONAME ; void RadioUiEngine::emitSeekingStarted(enum Seek::Direction)
- ?isRecognizedByRds@RadioHistoryItem@@QBE_NXZ @ 246 NONAME ; bool RadioHistoryItem::isRecognizedByRds(void) const
- ?setFavorites@RadioStationModel@@QAEXABV?$QList@VQModelIndex@@@@@Z @ 247 NONAME ; void RadioStationModel::setFavorites(class QList<class QModelIndex> const &)
- ?setArtist@RadioHistoryItem@@QAEXABVQString@@@Z @ 248 NONAME ; void RadioHistoryItem::setArtist(class QString const &)
- ??_ERadioStationModel@@UAE@I@Z @ 249 NONAME ; RadioStationModel::~RadioStationModel(unsigned int)
- ?setTitle@RadioHistoryItem@@QAEXABVQString@@@Z @ 250 NONAME ; void RadioHistoryItem::setTitle(class QString const &)
+ ?setPresetIndex@RadioStation@@AAEXH@Z @ 237 NONAME ; void RadioStation::setPresetIndex(int)
+ ?setName@RadioStation@@AAEXABVQString@@@Z @ 238 NONAME ; void RadioStation::setName(class QString const &)
+ ?trUtf8@RadioHistoryModel@@SA?AVQString@@PBD0@Z @ 239 NONAME ; class QString RadioHistoryModel::trUtf8(char const *, char const *)
+ ?frequencyStepSize@RadioUiEngine@@QBEIXZ @ 240 NONAME ; unsigned int RadioUiEngine::frequencyStepSize(void) const
+ ??0RadioHistoryModel@@AAE@AAVRadioUiEngine@@@Z @ 241 NONAME ; RadioHistoryModel::RadioHistoryModel(class RadioUiEngine &)
+ ?trUtf8@RadioStationModel@@SA?AVQString@@PBD0H@Z @ 242 NONAME ; class QString RadioStationModel::trUtf8(char const *, char const *, int)
+ ?radioTextReceived@RadioStationModel@@IAEXABVRadioStation@@@Z @ 243 NONAME ; void RadioStationModel::radioTextReceived(class RadioStation const &)
+ ?isFavorite@RadioStation@@QBE_NXZ @ 244 NONAME ; bool RadioStation::isFavorite(void) const
+ ?metaObject@RadioHistoryModel@@UBEPBUQMetaObject@@XZ @ 245 NONAME ; struct QMetaObject const * RadioHistoryModel::metaObject(void) const
+ ?seekingStarted@RadioUiEngine@@IAEXH@Z @ 246 NONAME ; void RadioUiEngine::seekingStarted(int)
+ ?emitSeekingStarted@RadioUiEngine@@AAEXW4Direction@Seek@@@Z @ 247 NONAME ; void RadioUiEngine::emitSeekingStarted(enum Seek::Direction)
+ ?isRecognizedByRds@RadioHistoryItem@@QBE_NXZ @ 248 NONAME ; bool RadioHistoryItem::isRecognizedByRds(void) const
+ ?setFavorites@RadioStationModel@@QAEXABV?$QList@VQModelIndex@@@@@Z @ 249 NONAME ; void RadioStationModel::setFavorites(class QList<class QModelIndex> const &)
+ ?setArtist@RadioHistoryItem@@QAEXABVQString@@@Z @ 250 NONAME ; void RadioHistoryItem::setArtist(class QString const &)
+ ??_ERadioStationModel@@UAE@I@Z @ 251 NONAME ; RadioStationModel::~RadioStationModel(unsigned int)
+ ?setTitle@RadioHistoryItem@@QAEXABVQString@@@Z @ 252 NONAME ; void RadioHistoryItem::setTitle(class QString const &)
+ ?lastVolume@RadioUiEngine@@SAHXZ @ 253 NONAME ; int RadioUiEngine::lastVolume(void)
--- a/radioapp/bwins/fmradiowidgetsu.def Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/bwins/fmradiowidgetsu.def Fri Jun 25 19:09:05 2010 +0300
@@ -2,155 +2,164 @@
?trUtf8@RadioWindow@@SA?AVQString@@PBD0H@Z @ 1 NONAME ; class QString RadioWindow::trUtf8(char const *, char const *, int)
?nextIndex@RadioStationCarousel@@AAEHH@Z @ 2 NONAME ; int RadioStationCarousel::nextIndex(int)
?scrollToIndex@RadioStationCarousel@@AAEXHW4Direction@Scroll@@V?$QFlags@W4ScrollFlag@RadioStationCarousel@@@@@Z @ 3 NONAME ; void RadioStationCarousel::scrollToIndex(int, enum Scroll::Direction, class QFlags<enum RadioStationCarousel::ScrollFlag>)
- ?updateItem@RadioFrequencyStrip@@AAEXPAVRadioFrequencyItem@@II@Z @ 4 NONAME ; void RadioFrequencyStrip::updateItem(class RadioFrequencyItem *, unsigned int, unsigned int)
- ?qt_metacast@RadioFadingLabel@@UAEPAXPBD@Z @ 5 NONAME ; void * RadioFadingLabel::qt_metacast(char const *)
- ?animateNewStation@RadioStationCarousel@@QAEXABVRadioStation@@@Z @ 6 NONAME ; void RadioStationCarousel::animateNewStation(class RadioStation const &)
- ?gestureEvent@RadioStationCarousel@@EAEXPAVQGestureEvent@@@Z @ 7 NONAME ; void RadioStationCarousel::gestureEvent(class QGestureEvent *)
- ?setFavoriteIcon@RadioStationCarousel@@QAEXABVHbIcon@@@Z @ 8 NONAME ; void RadioStationCarousel::setFavoriteIcon(class HbIcon const &)
- ?update@RadioStationCarousel@@AAEXABVRadioStation@@@Z @ 9 NONAME ; void RadioStationCarousel::update(class RadioStation const &)
- ?addFrequencyPos@RadioFrequencyStrip@@AAEXHIPAVRadioFrequencyItem@@@Z @ 10 NONAME ; void RadioFrequencyStrip::addFrequencyPos(int, unsigned int, class RadioFrequencyItem *)
- ?trUtf8@RadioFadingLabel@@SA?AVQString@@PBD0@Z @ 11 NONAME ; class QString RadioFadingLabel::trUtf8(char const *, char const *)
- ?setScanningMode@RadioFrequencyStrip@@QAEX_N@Z @ 12 NONAME ; void RadioFrequencyStrip::setScanningMode(bool)
- ?createItemPrimitive@RadioFrequencyStrip@@EAEPAVQGraphicsItem@@PAV2@@Z @ 13 NONAME ; class QGraphicsItem * RadioFrequencyStrip::createItemPrimitive(class QGraphicsItem *)
- ?skipRequested@RadioStationCarousel@@IAEXH@Z @ 14 NONAME ; void RadioStationCarousel::skipRequested(int)
- ?setTextWithoutFading@RadioFadingLabel@@QAEXABVQString@@@Z @ 15 NONAME ; void RadioFadingLabel::setTextWithoutFading(class QString const &)
- ?updateAntennaStatus@RadioWindow@@AAEX_N@Z @ 16 NONAME ; void RadioWindow::updateAntennaStatus(bool)
- ?resizeEvent@RadioFrequencyStrip@@EAEXPAVQGraphicsSceneResizeEvent@@@Z @ 17 NONAME ; void RadioFrequencyStrip::resizeEvent(class QGraphicsSceneResizeEvent *)
- ?init@RadioFrequencyStrip@@QAEXPAVRadioUiEngine@@AAVRadioUiLoader@@@Z @ 18 NONAME ; void RadioFrequencyStrip::init(class RadioUiEngine *, class RadioUiLoader &)
- ?initButtons@RadioFrequencyStrip@@AAEXXZ @ 19 NONAME ; void RadioFrequencyStrip::initButtons(void)
- ?qt_metacall@RadioStationCarousel@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 20 NONAME ; int RadioStationCarousel::qt_metacall(enum QMetaObject::Call, int, void * *)
- ?isInitialized@RadioStationCarousel@@ABE_NXZ @ 21 NONAME ; bool RadioStationCarousel::isInitialized(void) const
- ?init@RadioStationCarousel@@QAEXAAVRadioUiLoader@@PAVRadioUiEngine@@@Z @ 22 NONAME ; void RadioStationCarousel::init(class RadioUiLoader &, class RadioUiEngine *)
- ?manualSeekChanged@RadioFrequencyStrip@@IAEX_N@Z @ 23 NONAME ; void RadioFrequencyStrip::manualSeekChanged(bool)
- ?scrollPosChanged@RadioStationCarousel@@AAEXABVQPointF@@@Z @ 24 NONAME ; void RadioStationCarousel::scrollPosChanged(class QPointF const &)
- ?frequencyChanged@RadioFrequencyStrip@@IAEXIHH@Z @ 25 NONAME ; void RadioFrequencyStrip::frequencyChanged(unsigned int, int, int)
- ?setAutoScrollTime@RadioStationCarousel@@QAEXH@Z @ 26 NONAME ; void RadioStationCarousel::setAutoScrollTime(int)
- ?prevIndex@RadioStationCarousel@@AAEHH@Z @ 27 NONAME ; int RadioStationCarousel::prevIndex(int)
- ?trUtf8@RadioStationCarousel@@SA?AVQString@@PBD0@Z @ 28 NONAME ; class QString RadioStationCarousel::trUtf8(char const *, char const *)
- ?tr@RadioStationCarousel@@SA?AVQString@@PBD0@Z @ 29 NONAME ; class QString RadioStationCarousel::tr(char const *, char const *)
- ?skip@RadioStationCarousel@@AAEXW4Mode@StationSkip@@@Z @ 30 NONAME ; void RadioStationCarousel::skip(enum StationSkip::Mode)
- ?selectorPos@RadioFrequencyStrip@@ABEHXZ @ 31 NONAME ; int RadioFrequencyStrip::selectorPos(void) const
- ??1RadioWindow@@UAE@XZ @ 32 NONAME ; RadioWindow::~RadioWindow(void)
- ?skipRequested@RadioFrequencyStrip@@IAEXH@Z @ 33 NONAME ; void RadioFrequencyStrip::skipRequested(int)
- ?setText@RadioFadingLabel@@QAEXABVQString@@@Z @ 34 NONAME ; void RadioFadingLabel::setText(class QString const &)
- ?showEvent@RadioStationCarousel@@EAEXPAVQShowEvent@@@Z @ 35 NONAME ; void RadioStationCarousel::showEvent(class QShowEvent *)
- ?mousePressEvent@RadioStationCarousel@@EAEXPAVQGraphicsSceneMouseEvent@@@Z @ 36 NONAME ; void RadioStationCarousel::mousePressEvent(class QGraphicsSceneMouseEvent *)
- ?trUtf8@RadioFrequencyStrip@@SA?AVQString@@PBD0@Z @ 37 NONAME ; class QString RadioFrequencyStrip::trUtf8(char const *, char const *)
- ?handleScrollingEnd@RadioFrequencyStrip@@AAEXXZ @ 38 NONAME ; void RadioFrequencyStrip::handleScrollingEnd(void)
- ?favoriteIcon@RadioStationCarousel@@QBE?AVHbIcon@@XZ @ 39 NONAME ; class HbIcon RadioStationCarousel::favoriteIcon(void) const
- ?activateView@RadioWindow@@AAEXPAVRadioViewBase@@ABVQString@@V?$QFlags@W4ViewSwitchFlag@Hb@@@@@Z @ 40 NONAME ; void RadioWindow::activateView(class RadioViewBase *, class QString const &, class QFlags<enum Hb::ViewSwitchFlag>)
- ?calculateDifference@RadioStationCarousel@@AAEHHAAW4Direction@Scroll@@@Z @ 41 NONAME ; int RadioStationCarousel::calculateDifference(int, enum Scroll::Direction &)
- ?orientationSection@RadioWindow@@QAE?AVQString@@XZ @ 42 NONAME ; class QString RadioWindow::orientationSection(void)
- ?updateStation@RadioFrequencyStrip@@AAEXABVQModelIndex@@HH@Z @ 43 NONAME ; void RadioFrequencyStrip::updateStation(class QModelIndex const &, int, int)
- ??1RadioFrequencyStrip@@UAE@XZ @ 44 NONAME ; RadioFrequencyStrip::~RadioFrequencyStrip(void)
- ?queryOfflineUsage@RadioWindow@@AAEXW4Profile@QSystemDeviceInfo@QtMobility@@@Z @ 45 NONAME ; void RadioWindow::queryOfflineUsage(enum QtMobility::QSystemDeviceInfo::Profile)
- ?cancelAnimation@RadioStationCarousel@@QAEXXZ @ 46 NONAME ; void RadioStationCarousel::cancelAnimation(void)
- ?changeEvent@RadioFrequencyStrip@@EAEXPAVQEvent@@@Z @ 47 NONAME ; void RadioFrequencyStrip::changeEvent(class QEvent *)
- ?staticMetaObject@RadioStationCarousel@@2UQMetaObject@@B @ 48 NONAME ; struct QMetaObject const RadioStationCarousel::staticMetaObject
- ?qt_metacall@RadioFadingLabel@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 49 NONAME ; int RadioFadingLabel::qt_metacall(enum QMetaObject::Call, int, void * *)
- ??0RadioFrequencyStrip@@QAE@XZ @ 50 NONAME ; RadioFrequencyStrip::RadioFrequencyStrip(void)
- ?timerEvent@RadioFrequencyStrip@@EAEXPAVQTimerEvent@@@Z @ 51 NONAME ; void RadioFrequencyStrip::timerEvent(class QTimerEvent *)
- ?setCenterIndex@RadioStationCarousel@@AAEXHV?$QFlags@W4ScrollFlag@RadioStationCarousel@@@@@Z @ 52 NONAME ; void RadioStationCarousel::setCenterIndex(int, class QFlags<enum RadioStationCarousel::ScrollFlag>)
- ?resizeEvent@RadioStationCarousel@@EAEXPAVQGraphicsSceneResizeEvent@@@Z @ 53 NONAME ; void RadioStationCarousel::resizeEvent(class QGraphicsSceneResizeEvent *)
- ?updateStations@RadioStationCarousel@@AAEXXZ @ 54 NONAME ; void RadioStationCarousel::updateStations(void)
- ??_ERadioWindow@@UAE@I@Z @ 55 NONAME ; RadioWindow::~RadioWindow(unsigned int)
- ?tr@RadioFrequencyStrip@@SA?AVQString@@PBD0@Z @ 56 NONAME ; class QString RadioFrequencyStrip::tr(char const *, char const *)
- ?initSelector@RadioFrequencyStrip@@AAEXXZ @ 57 NONAME ; void RadioFrequencyStrip::initSelector(void)
- ?qt_metacall@RadioWindow@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 58 NONAME ; int RadioWindow::qt_metacall(enum QMetaObject::Call, int, void * *)
- ?qt_metacall@RadioFrequencyStrip@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 59 NONAME ; int RadioFrequencyStrip::qt_metacall(enum QMetaObject::Call, int, void * *)
- ?metaObject@RadioFrequencyStrip@@UBEPBUQMetaObject@@XZ @ 60 NONAME ; struct QMetaObject const * RadioFrequencyStrip::metaObject(void) const
- ?startEffect@RadioFadingLabel@@AAEXABVQString@@PBD@Z @ 61 NONAME ; void RadioFadingLabel::startEffect(class QString const &, char const *)
- ?setFrequency@RadioFrequencyStrip@@QAEXIHW4Direction@Scroll@@@Z @ 62 NONAME ; void RadioFrequencyStrip::setFrequency(unsigned int, int, enum Scroll::Direction)
- ?activateHistoryView@RadioWindow@@QAEXXZ @ 63 NONAME ; void RadioWindow::activateHistoryView(void)
- ??_ERadioStationCarousel@@UAE@I@Z @ 64 NONAME ; RadioStationCarousel::~RadioStationCarousel(unsigned int)
- ?initPositions@RadioFrequencyStrip@@AAEXXZ @ 65 NONAME ; void RadioFrequencyStrip::initPositions(void)
- ?tr@RadioFadingLabel@@SA?AVQString@@PBD0@Z @ 66 NONAME ; class QString RadioFadingLabel::tr(char const *, char const *)
- ?getStaticMetaObject@RadioFadingLabel@@SAABUQMetaObject@@XZ @ 67 NONAME ; struct QMetaObject const & RadioFadingLabel::getStaticMetaObject(void)
- ?setManualSeekMode@RadioStationCarousel@@QAEX_N@Z @ 68 NONAME ; void RadioStationCarousel::setManualSeekMode(bool)
- ?qt_metacast@RadioWindow@@UAEPAXPBD@Z @ 69 NONAME ; void * RadioWindow::qt_metacast(char const *)
- ?trimHtml@RadioFadingLabel@@AAE?AVQString@@ABV2@@Z @ 70 NONAME ; class QString RadioFadingLabel::trimHtml(class QString const &)
- ?tr@RadioWindow@@SA?AVQString@@PBD0@Z @ 71 NONAME ; class QString RadioWindow::tr(char const *, char const *)
- ?mouseReleaseEvent@RadioFrequencyStrip@@EAEXPAVQGraphicsSceneMouseEvent@@@Z @ 72 NONAME ; void RadioFrequencyStrip::mouseReleaseEvent(class QGraphicsSceneMouseEvent *)
- ?updateItemPrimitive@RadioFrequencyStrip@@EAEXPAVQGraphicsItem@@H@Z @ 73 NONAME ; void RadioFrequencyStrip::updateItemPrimitive(class QGraphicsItem *, int)
- ?getStaticMetaObject@RadioFrequencyStrip@@SAABUQMetaObject@@XZ @ 74 NONAME ; struct QMetaObject const & RadioFrequencyStrip::getStaticMetaObject(void)
- ?showErrorMessage@RadioWindow@@QAEXABVQString@@@Z @ 75 NONAME ; void RadioWindow::showErrorMessage(class QString const &)
- ??0RadioFadingLabel@@QAE@PAVQGraphicsItem@@@Z @ 76 NONAME ; RadioFadingLabel::RadioFadingLabel(class QGraphicsItem *)
- ?updateStationsInRange@RadioFrequencyStrip@@AAEXHH_N@Z @ 77 NONAME ; void RadioFrequencyStrip::updateStationsInRange(int, int, bool)
- ?initModel@RadioFrequencyStrip@@AAEXXZ @ 78 NONAME ; void RadioFrequencyStrip::initModel(void)
- ?frequency@RadioFrequencyStrip@@QBEIXZ @ 79 NONAME ; unsigned int RadioFrequencyStrip::frequency(void) const
- ??1RadioStationCarousel@@UAE@XZ @ 80 NONAME ; RadioStationCarousel::~RadioStationCarousel(void)
- ??_ERadioFrequencyStrip@@UAE@I@Z @ 81 NONAME ; RadioFrequencyStrip::~RadioFrequencyStrip(unsigned int)
- ?setFadingEnabled@RadioFadingLabel@@QAEX_N@Z @ 82 NONAME ; void RadioFadingLabel::setFadingEnabled(bool)
- ?mousePressEvent@RadioFrequencyStrip@@EAEXPAVQGraphicsSceneMouseEvent@@@Z @ 83 NONAME ; void RadioFrequencyStrip::mousePressEvent(class QGraphicsSceneMouseEvent *)
- ?showVolumeLevel@RadioWindow@@AAEXH@Z @ 84 NONAME ; void RadioWindow::showVolumeLevel(int)
- ?getStaticMetaObject@RadioWindow@@SAABUQMetaObject@@XZ @ 85 NONAME ; struct QMetaObject const & RadioWindow::getStaticMetaObject(void)
- ?trUtf8@RadioWindow@@SA?AVQString@@PBD0@Z @ 86 NONAME ; class QString RadioWindow::trUtf8(char const *, char const *)
- ?timerFired@RadioStationCarousel@@AAEXXZ @ 87 NONAME ; void RadioStationCarousel::timerFired(void)
- ?toggleManualSeek@RadioFrequencyStrip@@AAEXXZ @ 88 NONAME ; void RadioFrequencyStrip::toggleManualSeek(void)
- ?drawPixmap@RadioFrequencyStrip@@AAE?AVQPixmap@@IV?$QList@VRadioStation@@@@PAVRadioFrequencyItem@@@Z @ 89 NONAME ; class QPixmap RadioFrequencyStrip::drawPixmap(unsigned int, class QList<class RadioStation>, class RadioFrequencyItem *)
- ?initEmptyItems@RadioFrequencyStrip@@AAEXXZ @ 90 NONAME ; void RadioFrequencyStrip::initEmptyItems(void)
- ??0RadioWindow@@QAE@PAVQWidget@@@Z @ 91 NONAME ; RadioWindow::RadioWindow(class QWidget *)
- ?tr@RadioFadingLabel@@SA?AVQString@@PBD0H@Z @ 92 NONAME ; class QString RadioFadingLabel::tr(char const *, char const *, int)
- ?toggleFavorite@RadioStationCarousel@@AAEXXZ @ 93 NONAME ; void RadioStationCarousel::toggleFavorite(void)
- ?updateRadioText@RadioStationCarousel@@AAEXABVRadioStation@@@Z @ 94 NONAME ; void RadioStationCarousel::updateRadioText(class RadioStation const &)
- ?updateAntennaStatus@RadioStationCarousel@@QAEX_N@Z @ 95 NONAME ; void RadioStationCarousel::updateAntennaStatus(bool)
- ?updateFavorite@RadioFrequencyStrip@@QAEXABVRadioStation@@@Z @ 96 NONAME ; void RadioFrequencyStrip::updateFavorite(class RadioStation const &)
- ?setFrequency@RadioStationCarousel@@QAEXIHW4Direction@Scroll@@@Z @ 97 NONAME ; void RadioStationCarousel::setFrequency(unsigned int, int, enum Scroll::Direction)
- ?setInfoText@RadioStationCarousel@@QAEXW4Type@CarouselInfoText@@@Z @ 98 NONAME ; void RadioStationCarousel::setInfoText(enum CarouselInfoText::Type)
- ?staticMetaObject@RadioFadingLabel@@2UQMetaObject@@B @ 99 NONAME ; struct QMetaObject const RadioFadingLabel::staticMetaObject
- ?trUtf8@RadioFrequencyStrip@@SA?AVQString@@PBD0H@Z @ 100 NONAME ; class QString RadioFrequencyStrip::trUtf8(char const *, char const *, int)
- ?tr@RadioFrequencyStrip@@SA?AVQString@@PBD0H@Z @ 101 NONAME ; class QString RadioFrequencyStrip::tr(char const *, char const *, int)
- ?getStaticMetaObject@RadioStationCarousel@@SAABUQMetaObject@@XZ @ 102 NONAME ; struct QMetaObject const & RadioStationCarousel::getStaticMetaObject(void)
- ?metaObject@RadioFadingLabel@@UBEPBUQMetaObject@@XZ @ 103 NONAME ; struct QMetaObject const * RadioFadingLabel::metaObject(void) const
- ?metaObject@RadioWindow@@UBEPBUQMetaObject@@XZ @ 104 NONAME ; struct QMetaObject const * RadioWindow::metaObject(void) const
- ?staticMetaObject@RadioFrequencyStrip@@2UQMetaObject@@B @ 105 NONAME ; struct QMetaObject const RadioFrequencyStrip::staticMetaObject
- ?autoScrollTime@RadioStationCarousel@@QBEHXZ @ 106 NONAME ; int RadioStationCarousel::autoScrollTime(void) const
- ?handleRightButton@RadioFrequencyStrip@@AAEXXZ @ 107 NONAME ; void RadioFrequencyStrip::handleRightButton(void)
- ?qt_metacast@RadioStationCarousel@@UAEPAXPBD@Z @ 108 NONAME ; void * RadioStationCarousel::qt_metacast(char const *)
- ?tr@RadioWindow@@SA?AVQString@@PBD0H@Z @ 109 NONAME ; class QString RadioWindow::tr(char const *, char const *, int)
- ?addScannedStation@RadioFrequencyStrip@@QAEXABVRadioStation@@@Z @ 110 NONAME ; void RadioFrequencyStrip::addScannedStation(class RadioStation const &)
- ?handleLongRightButton@RadioFrequencyStrip@@AAEXXZ @ 111 NONAME ; void RadioFrequencyStrip::handleLongRightButton(void)
- ?seekRequested@RadioFrequencyStrip@@IAEXH@Z @ 112 NONAME ; void RadioFrequencyStrip::seekRequested(int)
- ?isInManualSeekMode@RadioFrequencyStrip@@QBE_NXZ @ 113 NONAME ; bool RadioFrequencyStrip::isInManualSeekMode(void) const
- ?scrollToFrequency@RadioFrequencyStrip@@AAEXIW4Direction@Scroll@@HW4Reason@TuneReason@@@Z @ 114 NONAME ; void RadioFrequencyStrip::scrollToFrequency(unsigned int, enum Scroll::Direction, int, enum TuneReason::Reason)
- ??0RadioStationCarousel@@QAE@PAVQGraphicsItem@@@Z @ 115 NONAME ; RadioStationCarousel::RadioStationCarousel(class QGraphicsItem *)
- ?adjustAfterScroll@RadioStationCarousel@@AAEXXZ @ 116 NONAME ; void RadioStationCarousel::adjustAfterScroll(void)
- ?metaObject@RadioStationCarousel@@UBEPBUQMetaObject@@XZ @ 117 NONAME ; struct QMetaObject const * RadioStationCarousel::metaObject(void) const
- ?effectFinished@RadioFadingLabel@@AAEXUEffectStatus@HbEffect@@@Z @ 118 NONAME ; void RadioFadingLabel::effectFinished(struct HbEffect::EffectStatus)
- ?updateOrientation@RadioWindow@@AAEXW4Orientation@Qt@@@Z @ 119 NONAME ; void RadioWindow::updateOrientation(enum Qt::Orientation)
- ?init@RadioWindow@@QAEXPAVQSystemDeviceInfo@QtMobility@@@Z @ 120 NONAME ; void RadioWindow::init(class QtMobility::QSystemDeviceInfo *)
- ?nonFavoriteIcon@RadioStationCarousel@@QBE?AVHbIcon@@XZ @ 121 NONAME ; class HbIcon RadioStationCarousel::nonFavoriteIcon(void) const
- ?showButtons@RadioFrequencyStrip@@AAEXXZ @ 122 NONAME ; void RadioFrequencyStrip::showButtons(void)
- ?uiEngine@RadioStationCarousel@@QAEPAVRadioUiEngine@@XZ @ 123 NONAME ; class RadioUiEngine * RadioStationCarousel::uiEngine(void)
- ?trUtf8@RadioFadingLabel@@SA?AVQString@@PBD0H@Z @ 124 NONAME ; class QString RadioFadingLabel::trUtf8(char const *, char const *, int)
- ?activateMainView@RadioWindow@@QAEXXZ @ 125 NONAME ; void RadioWindow::activateMainView(void)
- ?scrollPosChanged@RadioFrequencyStrip@@EAEXVQPointF@@@Z @ 126 NONAME ; void RadioFrequencyStrip::scrollPosChanged(class QPointF)
- ?setScanningMode@RadioStationCarousel@@QAEX_N@Z @ 127 NONAME ; void RadioStationCarousel::setScanningMode(bool)
- ??1RadioFadingLabel@@UAE@XZ @ 128 NONAME ; RadioFadingLabel::~RadioFadingLabel(void)
- ?setNonFavoriteIcon@RadioStationCarousel@@QAEXABVHbIcon@@@Z @ 129 NONAME ; void RadioStationCarousel::setNonFavoriteIcon(class HbIcon const &)
- ?isInScanningMode@RadioStationCarousel@@QBE_NXZ @ 130 NONAME ; bool RadioStationCarousel::isInScanningMode(void) const
- ?isAntennaAttached@RadioStationCarousel@@QBE_NXZ @ 131 NONAME ; bool RadioStationCarousel::isAntennaAttached(void) const
- ?activateStationsView@RadioWindow@@QAEXXZ @ 132 NONAME ; void RadioWindow::activateStationsView(void)
- ?removeStation@RadioFrequencyStrip@@AAEXABVQModelIndex@@HH@Z @ 133 NONAME ; void RadioFrequencyStrip::removeStation(class QModelIndex const &, int, int)
- ?tr@RadioStationCarousel@@SA?AVQString@@PBD0H@Z @ 134 NONAME ; class QString RadioStationCarousel::tr(char const *, char const *, int)
- ?trimIndex@RadioStationCarousel@@AAEHH@Z @ 135 NONAME ; int RadioStationCarousel::trimIndex(int)
- ?frequencyChanged@RadioStationCarousel@@IAEXIHH@Z @ 136 NONAME ; void RadioStationCarousel::frequencyChanged(unsigned int, int, int)
- ?setAlternateSkippingMode@RadioStationCarousel@@QAEX_N@Z @ 137 NONAME ; void RadioStationCarousel::setAlternateSkippingMode(bool)
- ?initView@RadioWindow@@AAEXXZ @ 138 NONAME ; void RadioWindow::initView(void)
- ?gestureEvent@RadioFrequencyStrip@@EAEXPAVQGestureEvent@@@Z @ 139 NONAME ; void RadioFrequencyStrip::gestureEvent(class QGestureEvent *)
- ?trUtf8@RadioStationCarousel@@SA?AVQString@@PBD0H@Z @ 140 NONAME ; class QString RadioStationCarousel::trUtf8(char const *, char const *, int)
- ?handleLongLeftButton@RadioFrequencyStrip@@AAEXXZ @ 141 NONAME ; void RadioFrequencyStrip::handleLongLeftButton(void)
- ?hideButtons@RadioFrequencyStrip@@AAEXXZ @ 142 NONAME ; void RadioFrequencyStrip::hideButtons(void)
- ?emitFrequencyChanged@RadioFrequencyStrip@@AAEXI@Z @ 143 NONAME ; void RadioFrequencyStrip::emitFrequencyChanged(unsigned int)
- ?handleLeftButton@RadioFrequencyStrip@@AAEXXZ @ 144 NONAME ; void RadioFrequencyStrip::handleLeftButton(void)
- ??_ERadioFadingLabel@@UAE@I@Z @ 145 NONAME ; RadioFadingLabel::~RadioFadingLabel(unsigned int)
- ?cancelManualSeek@RadioFrequencyStrip@@QAEXXZ @ 146 NONAME ; void RadioFrequencyStrip::cancelManualSeek(void)
- ?isScrollingAllowed@RadioStationCarousel@@ABE_NXZ @ 147 NONAME ; bool RadioStationCarousel::isScrollingAllowed(void) const
- ?qt_metacast@RadioFrequencyStrip@@UAEPAXPBD@Z @ 148 NONAME ; void * RadioFrequencyStrip::qt_metacast(char const *)
- ?staticMetaObject@RadioWindow@@2UQMetaObject@@B @ 149 NONAME ; struct QMetaObject const RadioWindow::staticMetaObject
- ?cleanRdsData@RadioStationCarousel@@QAEXXZ @ 150 NONAME ; void RadioStationCarousel::cleanRdsData(void)
- ?clearInfoText@RadioStationCarousel@@QAEXXZ @ 151 NONAME ; void RadioStationCarousel::clearInfoText(void)
- ?updateAllItems@RadioFrequencyStrip@@AAEXXZ @ 152 NONAME ; void RadioFrequencyStrip::updateAllItems(void)
- ?adjustPos@RadioStationCarousel@@AAEXH@Z @ 153 NONAME ; void RadioStationCarousel::adjustPos(int)
- ?scanAnimationFinished@RadioStationCarousel@@IAEXXZ @ 154 NONAME ; void RadioStationCarousel::scanAnimationFinished(void)
+ ?drawOffScreen@RadioStationCarousel@@QAEXAAVQPainter@@@Z @ 4 NONAME ; void RadioStationCarousel::drawOffScreen(class QPainter &)
+ ?updateItem@RadioFrequencyStrip@@AAEXPAVRadioFrequencyItem@@II@Z @ 5 NONAME ; void RadioFrequencyStrip::updateItem(class RadioFrequencyItem *, unsigned int, unsigned int)
+ ?qt_metacast@RadioFadingLabel@@UAEPAXPBD@Z @ 6 NONAME ; void * RadioFadingLabel::qt_metacast(char const *)
+ ?findStation@RadioStationCarousel@@EAE?AVRadioStation@@I@Z @ 7 NONAME ; class RadioStation RadioStationCarousel::findStation(unsigned int)
+ ?animateNewStation@RadioStationCarousel@@QAEXABVRadioStation@@@Z @ 8 NONAME ; void RadioStationCarousel::animateNewStation(class RadioStation const &)
+ ?nonFavoriteIcon@RadioStationCarousel@@UBE?AVHbIcon@@XZ @ 9 NONAME ; class HbIcon RadioStationCarousel::nonFavoriteIcon(void) const
+ ?gestureEvent@RadioStationCarousel@@EAEXPAVQGestureEvent@@@Z @ 10 NONAME ; void RadioStationCarousel::gestureEvent(class QGestureEvent *)
+ ?setFavoriteIcon@RadioStationCarousel@@QAEXABVHbIcon@@@Z @ 11 NONAME ; void RadioStationCarousel::setFavoriteIcon(class HbIcon const &)
+ ?update@RadioStationCarousel@@AAEXABVRadioStation@@@Z @ 12 NONAME ; void RadioStationCarousel::update(class RadioStation const &)
+ ?addFrequencyPos@RadioFrequencyStrip@@AAEXHIPAVRadioFrequencyItem@@@Z @ 13 NONAME ; void RadioFrequencyStrip::addFrequencyPos(int, unsigned int, class RadioFrequencyItem *)
+ ?trUtf8@RadioFadingLabel@@SA?AVQString@@PBD0@Z @ 14 NONAME ; class QString RadioFadingLabel::trUtf8(char const *, char const *)
+ ?setScanningMode@RadioFrequencyStrip@@QAEX_N@Z @ 15 NONAME ; void RadioFrequencyStrip::setScanningMode(bool)
+ ?handleUrlClicked@RadioStationCarousel@@EAEXABVRadioStation@@@Z @ 16 NONAME ; void RadioStationCarousel::handleUrlClicked(class RadioStation const &)
+ ?createItemPrimitive@RadioFrequencyStrip@@EAEPAVQGraphicsItem@@PAV2@@Z @ 17 NONAME ; class QGraphicsItem * RadioFrequencyStrip::createItemPrimitive(class QGraphicsItem *)
+ ?skipRequested@RadioStationCarousel@@IAEXH@Z @ 18 NONAME ; void RadioStationCarousel::skipRequested(int)
+ ?setTextWithoutFading@RadioFadingLabel@@QAEXABVQString@@@Z @ 19 NONAME ; void RadioFadingLabel::setTextWithoutFading(class QString const &)
+ ?updateAntennaStatus@RadioWindow@@AAEX_N@Z @ 20 NONAME ; void RadioWindow::updateAntennaStatus(bool)
+ ?handleIconClicked@RadioStationCarousel@@EAEXABVRadioStation@@@Z @ 21 NONAME ; void RadioStationCarousel::handleIconClicked(class RadioStation const &)
+ ?resizeEvent@RadioFrequencyStrip@@EAEXPAVQGraphicsSceneResizeEvent@@@Z @ 22 NONAME ; void RadioFrequencyStrip::resizeEvent(class QGraphicsSceneResizeEvent *)
+ ?init@RadioFrequencyStrip@@QAEXPAVRadioUiEngine@@AAVRadioUiLoader@@@Z @ 23 NONAME ; void RadioFrequencyStrip::init(class RadioUiEngine *, class RadioUiLoader &)
+ ?initButtons@RadioFrequencyStrip@@AAEXXZ @ 24 NONAME ; void RadioFrequencyStrip::initButtons(void)
+ ?qt_metacall@RadioStationCarousel@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 25 NONAME ; int RadioStationCarousel::qt_metacall(enum QMetaObject::Call, int, void * *)
+ ?isInitialized@RadioStationCarousel@@ABE_NXZ @ 26 NONAME ; bool RadioStationCarousel::isInitialized(void) const
+ ?init@RadioStationCarousel@@QAEXAAVRadioUiLoader@@PAVRadioUiEngine@@@Z @ 27 NONAME ; void RadioStationCarousel::init(class RadioUiLoader &, class RadioUiEngine *)
+ ?manualSeekChanged@RadioFrequencyStrip@@IAEX_N@Z @ 28 NONAME ; void RadioFrequencyStrip::manualSeekChanged(bool)
+ ?scrollPosChanged@RadioStationCarousel@@AAEXABVQPointF@@@Z @ 29 NONAME ; void RadioStationCarousel::scrollPosChanged(class QPointF const &)
+ ?frequencyChanged@RadioFrequencyStrip@@IAEXIHH@Z @ 30 NONAME ; void RadioFrequencyStrip::frequencyChanged(unsigned int, int, int)
+ ?setAutoScrollTime@RadioStationCarousel@@QAEXH@Z @ 31 NONAME ; void RadioStationCarousel::setAutoScrollTime(int)
+ ?prevIndex@RadioStationCarousel@@AAEHH@Z @ 32 NONAME ; int RadioStationCarousel::prevIndex(int)
+ ?trUtf8@RadioStationCarousel@@SA?AVQString@@PBD0@Z @ 33 NONAME ; class QString RadioStationCarousel::trUtf8(char const *, char const *)
+ ?tr@RadioStationCarousel@@SA?AVQString@@PBD0@Z @ 34 NONAME ; class QString RadioStationCarousel::tr(char const *, char const *)
+ ?skip@RadioStationCarousel@@AAEXW4Mode@StationSkip@@@Z @ 35 NONAME ; void RadioStationCarousel::skip(enum StationSkip::Mode)
+ ?selectorPos@RadioFrequencyStrip@@ABEHXZ @ 36 NONAME ; int RadioFrequencyStrip::selectorPos(void) const
+ ??1RadioWindow@@UAE@XZ @ 37 NONAME ; RadioWindow::~RadioWindow(void)
+ ?skipRequested@RadioFrequencyStrip@@IAEXH@Z @ 38 NONAME ; void RadioFrequencyStrip::skipRequested(int)
+ ?setText@RadioFadingLabel@@QAEXABVQString@@@Z @ 39 NONAME ; void RadioFadingLabel::setText(class QString const &)
+ ?showEvent@RadioStationCarousel@@EAEXPAVQShowEvent@@@Z @ 40 NONAME ; void RadioStationCarousel::showEvent(class QShowEvent *)
+ ?mousePressEvent@RadioStationCarousel@@EAEXPAVQGraphicsSceneMouseEvent@@@Z @ 41 NONAME ; void RadioStationCarousel::mousePressEvent(class QGraphicsSceneMouseEvent *)
+ ?trUtf8@RadioFrequencyStrip@@SA?AVQString@@PBD0@Z @ 42 NONAME ; class QString RadioFrequencyStrip::trUtf8(char const *, char const *)
+ ?handleScrollingEnd@RadioFrequencyStrip@@AAEXXZ @ 43 NONAME ; void RadioFrequencyStrip::handleScrollingEnd(void)
+ ?activateView@RadioWindow@@AAEXPAVRadioViewBase@@ABVQString@@V?$QFlags@W4ViewSwitchFlag@Hb@@@@@Z @ 44 NONAME ; void RadioWindow::activateView(class RadioViewBase *, class QString const &, class QFlags<enum Hb::ViewSwitchFlag>)
+ ?calculateDifference@RadioStationCarousel@@AAEHHAAW4Direction@Scroll@@@Z @ 45 NONAME ; int RadioStationCarousel::calculateDifference(int, enum Scroll::Direction &)
+ ?orientationSection@RadioWindow@@QAE?AVQString@@XZ @ 46 NONAME ; class QString RadioWindow::orientationSection(void)
+ ?updateStation@RadioFrequencyStrip@@AAEXABVQModelIndex@@HH@Z @ 47 NONAME ; void RadioFrequencyStrip::updateStation(class QModelIndex const &, int, int)
+ ??1RadioFrequencyStrip@@UAE@XZ @ 48 NONAME ; RadioFrequencyStrip::~RadioFrequencyStrip(void)
+ ?setItemHeight@RadioFrequencyStrip@@QAEXH@Z @ 49 NONAME ; void RadioFrequencyStrip::setItemHeight(int)
+ ?queryOfflineUsage@RadioWindow@@AAEXW4Profile@QSystemDeviceInfo@QtMobility@@@Z @ 50 NONAME ; void RadioWindow::queryOfflineUsage(enum QtMobility::QSystemDeviceInfo::Profile)
+ ?cancelAnimation@RadioStationCarousel@@QAEXXZ @ 51 NONAME ; void RadioStationCarousel::cancelAnimation(void)
+ ?changeEvent@RadioFrequencyStrip@@EAEXPAVQEvent@@@Z @ 52 NONAME ; void RadioFrequencyStrip::changeEvent(class QEvent *)
+ ?staticMetaObject@RadioStationCarousel@@2UQMetaObject@@B @ 53 NONAME ; struct QMetaObject const RadioStationCarousel::staticMetaObject
+ ?qt_metacall@RadioFadingLabel@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 54 NONAME ; int RadioFadingLabel::qt_metacall(enum QMetaObject::Call, int, void * *)
+ ??0RadioFrequencyStrip@@QAE@XZ @ 55 NONAME ; RadioFrequencyStrip::RadioFrequencyStrip(void)
+ ?timerEvent@RadioFrequencyStrip@@EAEXPAVQTimerEvent@@@Z @ 56 NONAME ; void RadioFrequencyStrip::timerEvent(class QTimerEvent *)
+ ?setCenterIndex@RadioStationCarousel@@AAEXHV?$QFlags@W4ScrollFlag@RadioStationCarousel@@@@@Z @ 57 NONAME ; void RadioStationCarousel::setCenterIndex(int, class QFlags<enum RadioStationCarousel::ScrollFlag>)
+ ?resizeEvent@RadioStationCarousel@@EAEXPAVQGraphicsSceneResizeEvent@@@Z @ 58 NONAME ; void RadioStationCarousel::resizeEvent(class QGraphicsSceneResizeEvent *)
+ ?scrollPosChanged@RadioFrequencyStrip@@EAEXXZ @ 59 NONAME ; void RadioFrequencyStrip::scrollPosChanged(void)
+ ?updateStations@RadioStationCarousel@@AAEXXZ @ 60 NONAME ; void RadioStationCarousel::updateStations(void)
+ ??_ERadioWindow@@UAE@I@Z @ 61 NONAME ; RadioWindow::~RadioWindow(unsigned int)
+ ?tr@RadioFrequencyStrip@@SA?AVQString@@PBD0@Z @ 62 NONAME ; class QString RadioFrequencyStrip::tr(char const *, char const *)
+ ?initSelector@RadioFrequencyStrip@@AAEXXZ @ 63 NONAME ; void RadioFrequencyStrip::initSelector(void)
+ ?qt_metacall@RadioWindow@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 64 NONAME ; int RadioWindow::qt_metacall(enum QMetaObject::Call, int, void * *)
+ ?qt_metacall@RadioFrequencyStrip@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 65 NONAME ; int RadioFrequencyStrip::qt_metacall(enum QMetaObject::Call, int, void * *)
+ ?metaObject@RadioFrequencyStrip@@UBEPBUQMetaObject@@XZ @ 66 NONAME ; struct QMetaObject const * RadioFrequencyStrip::metaObject(void) const
+ ?startEffect@RadioFadingLabel@@AAEXABVQString@@PBD@Z @ 67 NONAME ; void RadioFadingLabel::startEffect(class QString const &, char const *)
+ ?setFrequency@RadioFrequencyStrip@@QAEXIHW4Direction@Scroll@@@Z @ 68 NONAME ; void RadioFrequencyStrip::setFrequency(unsigned int, int, enum Scroll::Direction)
+ ?activateHistoryView@RadioWindow@@QAEXXZ @ 69 NONAME ; void RadioWindow::activateHistoryView(void)
+ ??_ERadioStationCarousel@@UAE@I@Z @ 70 NONAME ; RadioStationCarousel::~RadioStationCarousel(unsigned int)
+ ?initPositions@RadioFrequencyStrip@@AAEXXZ @ 71 NONAME ; void RadioFrequencyStrip::initPositions(void)
+ ?tr@RadioFadingLabel@@SA?AVQString@@PBD0@Z @ 72 NONAME ; class QString RadioFadingLabel::tr(char const *, char const *)
+ ?getStaticMetaObject@RadioFadingLabel@@SAABUQMetaObject@@XZ @ 73 NONAME ; struct QMetaObject const & RadioFadingLabel::getStaticMetaObject(void)
+ ?itemHeight@RadioFrequencyStrip@@QBEHXZ @ 74 NONAME ; int RadioFrequencyStrip::itemHeight(void) const
+ ?setManualSeekMode@RadioStationCarousel@@QAEX_N@Z @ 75 NONAME ; void RadioStationCarousel::setManualSeekMode(bool)
+ ?qt_metacast@RadioWindow@@UAEPAXPBD@Z @ 76 NONAME ; void * RadioWindow::qt_metacast(char const *)
+ ?trimHtml@RadioFadingLabel@@AAE?AVQString@@ABV2@@Z @ 77 NONAME ; class QString RadioFadingLabel::trimHtml(class QString const &)
+ ?tr@RadioWindow@@SA?AVQString@@PBD0@Z @ 78 NONAME ; class QString RadioWindow::tr(char const *, char const *)
+ ?favoriteIcon@RadioStationCarousel@@UBE?AVHbIcon@@XZ @ 79 NONAME ; class HbIcon RadioStationCarousel::favoriteIcon(void) const
+ ?mouseReleaseEvent@RadioFrequencyStrip@@EAEXPAVQGraphicsSceneMouseEvent@@@Z @ 80 NONAME ; void RadioFrequencyStrip::mouseReleaseEvent(class QGraphicsSceneMouseEvent *)
+ ?updateItemPrimitive@RadioFrequencyStrip@@EAEXPAVQGraphicsItem@@H@Z @ 81 NONAME ; void RadioFrequencyStrip::updateItemPrimitive(class QGraphicsItem *, int)
+ ?getStaticMetaObject@RadioFrequencyStrip@@SAABUQMetaObject@@XZ @ 82 NONAME ; struct QMetaObject const & RadioFrequencyStrip::getStaticMetaObject(void)
+ ?showErrorMessage@RadioWindow@@QAEXABVQString@@@Z @ 83 NONAME ; void RadioWindow::showErrorMessage(class QString const &)
+ ??0RadioFadingLabel@@QAE@PAVQGraphicsItem@@@Z @ 84 NONAME ; RadioFadingLabel::RadioFadingLabel(class QGraphicsItem *)
+ ?updateStationsInRange@RadioFrequencyStrip@@AAEXHH_N@Z @ 85 NONAME ; void RadioFrequencyStrip::updateStationsInRange(int, int, bool)
+ ?initModel@RadioFrequencyStrip@@AAEXXZ @ 86 NONAME ; void RadioFrequencyStrip::initModel(void)
+ ?frequency@RadioFrequencyStrip@@QBEIXZ @ 87 NONAME ; unsigned int RadioFrequencyStrip::frequency(void) const
+ ?isInManualSeek@RadioStationCarousel@@EBE_NXZ @ 88 NONAME ; bool RadioStationCarousel::isInManualSeek(void) const
+ ??1RadioStationCarousel@@UAE@XZ @ 89 NONAME ; RadioStationCarousel::~RadioStationCarousel(void)
+ ??_ERadioFrequencyStrip@@UAE@I@Z @ 90 NONAME ; RadioFrequencyStrip::~RadioFrequencyStrip(unsigned int)
+ ?setFadingEnabled@RadioFadingLabel@@QAEX_N@Z @ 91 NONAME ; void RadioFadingLabel::setFadingEnabled(bool)
+ ?localizeGenre@RadioStationCarousel@@EAE?AVQString@@H@Z @ 92 NONAME ; class QString RadioStationCarousel::localizeGenre(int)
+ ?mousePressEvent@RadioFrequencyStrip@@EAEXPAVQGraphicsSceneMouseEvent@@@Z @ 93 NONAME ; void RadioFrequencyStrip::mousePressEvent(class QGraphicsSceneMouseEvent *)
+ ?showVolumeLevel@RadioWindow@@AAEXH@Z @ 94 NONAME ; void RadioWindow::showVolumeLevel(int)
+ ?getStaticMetaObject@RadioWindow@@SAABUQMetaObject@@XZ @ 95 NONAME ; struct QMetaObject const & RadioWindow::getStaticMetaObject(void)
+ ?trUtf8@RadioWindow@@SA?AVQString@@PBD0@Z @ 96 NONAME ; class QString RadioWindow::trUtf8(char const *, char const *)
+ ?toggleManualSeek@RadioFrequencyStrip@@AAEXXZ @ 97 NONAME ; void RadioFrequencyStrip::toggleManualSeek(void)
+ ?timerFired@RadioStationCarousel@@AAEXXZ @ 98 NONAME ; void RadioStationCarousel::timerFired(void)
+ ?handleRadiotextClicked@RadioStationCarousel@@EAEXABVRadioStation@@@Z @ 99 NONAME ; void RadioStationCarousel::handleRadiotextClicked(class RadioStation const &)
+ ?drawPixmap@RadioFrequencyStrip@@AAE?AVQPixmap@@IV?$QList@VRadioStation@@@@PAVRadioFrequencyItem@@@Z @ 100 NONAME ; class QPixmap RadioFrequencyStrip::drawPixmap(unsigned int, class QList<class RadioStation>, class RadioFrequencyItem *)
+ ?initEmptyItems@RadioFrequencyStrip@@AAEXXZ @ 101 NONAME ; void RadioFrequencyStrip::initEmptyItems(void)
+ ?tr@RadioFadingLabel@@SA?AVQString@@PBD0H@Z @ 102 NONAME ; class QString RadioFadingLabel::tr(char const *, char const *, int)
+ ??0RadioWindow@@QAE@PAVQWidget@@@Z @ 103 NONAME ; RadioWindow::RadioWindow(class QWidget *)
+ ?updateRadioText@RadioStationCarousel@@AAEXABVRadioStation@@@Z @ 104 NONAME ; void RadioStationCarousel::updateRadioText(class RadioStation const &)
+ ?updateAntennaStatus@RadioStationCarousel@@QAEX_N@Z @ 105 NONAME ; void RadioStationCarousel::updateAntennaStatus(bool)
+ ?updateFavorite@RadioFrequencyStrip@@QAEXABVRadioStation@@@Z @ 106 NONAME ; void RadioFrequencyStrip::updateFavorite(class RadioStation const &)
+ ?setFrequency@RadioStationCarousel@@QAEXIHW4Direction@Scroll@@@Z @ 107 NONAME ; void RadioStationCarousel::setFrequency(unsigned int, int, enum Scroll::Direction)
+ ?setInfoText@RadioStationCarousel@@QAEXW4Type@CarouselInfoText@@@Z @ 108 NONAME ; void RadioStationCarousel::setInfoText(enum CarouselInfoText::Type)
+ ?staticMetaObject@RadioFadingLabel@@2UQMetaObject@@B @ 109 NONAME ; struct QMetaObject const RadioFadingLabel::staticMetaObject
+ ?trUtf8@RadioFrequencyStrip@@SA?AVQString@@PBD0H@Z @ 110 NONAME ; class QString RadioFrequencyStrip::trUtf8(char const *, char const *, int)
+ ?tr@RadioFrequencyStrip@@SA?AVQString@@PBD0H@Z @ 111 NONAME ; class QString RadioFrequencyStrip::tr(char const *, char const *, int)
+ ?getStaticMetaObject@RadioStationCarousel@@SAABUQMetaObject@@XZ @ 112 NONAME ; struct QMetaObject const & RadioStationCarousel::getStaticMetaObject(void)
+ ?metaObject@RadioFadingLabel@@UBEPBUQMetaObject@@XZ @ 113 NONAME ; struct QMetaObject const * RadioFadingLabel::metaObject(void) const
+ ?metaObject@RadioWindow@@UBEPBUQMetaObject@@XZ @ 114 NONAME ; struct QMetaObject const * RadioWindow::metaObject(void) const
+ ?staticMetaObject@RadioFrequencyStrip@@2UQMetaObject@@B @ 115 NONAME ; struct QMetaObject const RadioFrequencyStrip::staticMetaObject
+ ?autoScrollTime@RadioStationCarousel@@QBEHXZ @ 116 NONAME ; int RadioStationCarousel::autoScrollTime(void) const
+ ?handleRightButton@RadioFrequencyStrip@@AAEXXZ @ 117 NONAME ; void RadioFrequencyStrip::handleRightButton(void)
+ ?qt_metacast@RadioStationCarousel@@UAEPAXPBD@Z @ 118 NONAME ; void * RadioStationCarousel::qt_metacast(char const *)
+ ?tr@RadioWindow@@SA?AVQString@@PBD0H@Z @ 119 NONAME ; class QString RadioWindow::tr(char const *, char const *, int)
+ ?addScannedStation@RadioFrequencyStrip@@QAEXABVRadioStation@@@Z @ 120 NONAME ; void RadioFrequencyStrip::addScannedStation(class RadioStation const &)
+ ?handleLongRightButton@RadioFrequencyStrip@@AAEXXZ @ 121 NONAME ; void RadioFrequencyStrip::handleLongRightButton(void)
+ ?seekRequested@RadioFrequencyStrip@@IAEXH@Z @ 122 NONAME ; void RadioFrequencyStrip::seekRequested(int)
+ ?isInManualSeekMode@RadioFrequencyStrip@@QBE_NXZ @ 123 NONAME ; bool RadioFrequencyStrip::isInManualSeekMode(void) const
+ ?scrollToFrequency@RadioFrequencyStrip@@AAEXIW4Direction@Scroll@@HW4Reason@TuneReason@@@Z @ 124 NONAME ; void RadioFrequencyStrip::scrollToFrequency(unsigned int, enum Scroll::Direction, int, enum TuneReason::Reason)
+ ??0RadioStationCarousel@@QAE@PAVQGraphicsItem@@@Z @ 125 NONAME ; RadioStationCarousel::RadioStationCarousel(class QGraphicsItem *)
+ ?adjustAfterScroll@RadioStationCarousel@@AAEXXZ @ 126 NONAME ; void RadioStationCarousel::adjustAfterScroll(void)
+ ?metaObject@RadioStationCarousel@@UBEPBUQMetaObject@@XZ @ 127 NONAME ; struct QMetaObject const * RadioStationCarousel::metaObject(void) const
+ ?effectFinished@RadioFadingLabel@@AAEXUEffectStatus@HbEffect@@@Z @ 128 NONAME ; void RadioFadingLabel::effectFinished(struct HbEffect::EffectStatus)
+ ?updateOrientation@RadioWindow@@AAEXW4Orientation@Qt@@@Z @ 129 NONAME ; void RadioWindow::updateOrientation(enum Qt::Orientation)
+ ?init@RadioWindow@@QAEXPAVQSystemDeviceInfo@QtMobility@@@Z @ 130 NONAME ; void RadioWindow::init(class QtMobility::QSystemDeviceInfo *)
+ ?showButtons@RadioFrequencyStrip@@AAEXXZ @ 131 NONAME ; void RadioFrequencyStrip::showButtons(void)
+ ?uiEngine@RadioStationCarousel@@QAEPAVRadioUiEngine@@XZ @ 132 NONAME ; class RadioUiEngine * RadioStationCarousel::uiEngine(void)
+ ?trUtf8@RadioFadingLabel@@SA?AVQString@@PBD0H@Z @ 133 NONAME ; class QString RadioFadingLabel::trUtf8(char const *, char const *, int)
+ ?activateMainView@RadioWindow@@QAEXXZ @ 134 NONAME ; void RadioWindow::activateMainView(void)
+ ?setScanningMode@RadioStationCarousel@@QAEX_N@Z @ 135 NONAME ; void RadioStationCarousel::setScanningMode(bool)
+ ??1RadioFadingLabel@@UAE@XZ @ 136 NONAME ; RadioFadingLabel::~RadioFadingLabel(void)
+ ?setNonFavoriteIcon@RadioStationCarousel@@QAEXABVHbIcon@@@Z @ 137 NONAME ; void RadioStationCarousel::setNonFavoriteIcon(class HbIcon const &)
+ ?isInScanningMode@RadioStationCarousel@@QBE_NXZ @ 138 NONAME ; bool RadioStationCarousel::isInScanningMode(void) const
+ ?isAntennaAttached@RadioStationCarousel@@QBE_NXZ @ 139 NONAME ; bool RadioStationCarousel::isAntennaAttached(void) const
+ ?activateStationsView@RadioWindow@@QAEXXZ @ 140 NONAME ; void RadioWindow::activateStationsView(void)
+ ?removeStation@RadioFrequencyStrip@@AAEXABVQModelIndex@@HH@Z @ 141 NONAME ; void RadioFrequencyStrip::removeStation(class QModelIndex const &, int, int)
+ ?tr@RadioStationCarousel@@SA?AVQString@@PBD0H@Z @ 142 NONAME ; class QString RadioStationCarousel::tr(char const *, char const *, int)
+ ?trimIndex@RadioStationCarousel@@AAEHH@Z @ 143 NONAME ; int RadioStationCarousel::trimIndex(int)
+ ?frequencyChanged@RadioStationCarousel@@IAEXIHH@Z @ 144 NONAME ; void RadioStationCarousel::frequencyChanged(unsigned int, int, int)
+ ?setAlternateSkippingMode@RadioStationCarousel@@QAEX_N@Z @ 145 NONAME ; void RadioStationCarousel::setAlternateSkippingMode(bool)
+ ?initView@RadioWindow@@AAEXXZ @ 146 NONAME ; void RadioWindow::initView(void)
+ ?gestureEvent@RadioFrequencyStrip@@EAEXPAVQGestureEvent@@@Z @ 147 NONAME ; void RadioFrequencyStrip::gestureEvent(class QGestureEvent *)
+ ?trUtf8@RadioStationCarousel@@SA?AVQString@@PBD0H@Z @ 148 NONAME ; class QString RadioStationCarousel::trUtf8(char const *, char const *, int)
+ ?handleLongLeftButton@RadioFrequencyStrip@@AAEXXZ @ 149 NONAME ; void RadioFrequencyStrip::handleLongLeftButton(void)
+ ?hideButtons@RadioFrequencyStrip@@AAEXXZ @ 150 NONAME ; void RadioFrequencyStrip::hideButtons(void)
+ ?emitFrequencyChanged@RadioFrequencyStrip@@AAEXI@Z @ 151 NONAME ; void RadioFrequencyStrip::emitFrequencyChanged(unsigned int)
+ ?handleLeftButton@RadioFrequencyStrip@@AAEXXZ @ 152 NONAME ; void RadioFrequencyStrip::handleLeftButton(void)
+ ??_ERadioFadingLabel@@UAE@I@Z @ 153 NONAME ; RadioFadingLabel::~RadioFadingLabel(unsigned int)
+ ?cancelManualSeek@RadioFrequencyStrip@@QAEXXZ @ 154 NONAME ; void RadioFrequencyStrip::cancelManualSeek(void)
+ ?isScrollingAllowed@RadioStationCarousel@@ABE_NXZ @ 155 NONAME ; bool RadioStationCarousel::isScrollingAllowed(void) const
+ ?qt_metacast@RadioFrequencyStrip@@UAEPAXPBD@Z @ 156 NONAME ; void * RadioFrequencyStrip::qt_metacast(char const *)
+ ?staticMetaObject@RadioWindow@@2UQMetaObject@@B @ 157 NONAME ; struct QMetaObject const RadioWindow::staticMetaObject
+ ?cleanRdsData@RadioStationCarousel@@QAEXXZ @ 158 NONAME ; void RadioStationCarousel::cleanRdsData(void)
+ ?clearInfoText@RadioStationCarousel@@QAEXXZ @ 159 NONAME ; void RadioStationCarousel::clearInfoText(void)
+ ?updateAllItems@RadioFrequencyStrip@@AAEXXZ @ 160 NONAME ; void RadioFrequencyStrip::updateAllItems(void)
+ ?adjustPos@RadioStationCarousel@@AAEXH@Z @ 161 NONAME ; void RadioStationCarousel::adjustPos(int)
+ ?scanAnimationFinished@RadioStationCarousel@@IAEXXZ @ 162 NONAME ; void RadioStationCarousel::scanAnimationFinished(void)
+ ?makeTab@RadioFrequencyStrip@@AAE?AVQLineF@@MH@Z @ 163 NONAME ; class QLineF RadioFrequencyStrip::makeTab(float, int)
--- a/radioapp/eabi/fmradiouiengineu.def Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/eabi/fmradiouiengineu.def Fri Jun 25 19:09:05 2010 +0300
@@ -13,55 +13,55 @@
_ZN12RadioStation16setDynamicPsTextERK7QString @ 12 NONAME
_ZN12RadioStation16setRadioTextPlusEiRK7QString @ 13 NONAME
_ZN12RadioStation18setUserDefinedNameERK7QString @ 14 NONAME
- _ZN12RadioStation23decrementReferenceCountEv @ 15 NONAME
- _ZN12RadioStation5resetEv @ 16 NONAME
- _ZN12RadioStation6detachEv @ 17 NONAME
- _ZN12RadioStation6setUrlERK7QString @ 18 NONAME
- _ZN12RadioStation7setNameERK7QString @ 19 NONAME
- _ZN12RadioStation7setTypeE6QFlagsINS_8TypeFlagEE @ 20 NONAME
- _ZN12RadioStation8setGenreEi @ 21 NONAME
- _ZN12RadioStation9setPiCodeEiN11RadioRegion6RegionE @ 22 NONAME
- _ZN12RadioStation9setPsTypeE6QFlagsINS_10PsTypeFlagEE @ 23 NONAME
- _ZN12RadioStation9unsetTypeE6QFlagsINS_8TypeFlagEE @ 24 NONAME
- _ZN12RadioStationC1ERKS_ @ 25 NONAME
- _ZN12RadioStationC1Eij @ 26 NONAME
- _ZN12RadioStationC1Ev @ 27 NONAME
- _ZN12RadioStationC2ERKS_ @ 28 NONAME
- _ZN12RadioStationC2Eij @ 29 NONAME
- _ZN12RadioStationC2Ev @ 30 NONAME
- _ZN12RadioStationD0Ev @ 31 NONAME
- _ZN12RadioStationD1Ev @ 32 NONAME
- _ZN12RadioStationD2Ev @ 33 NONAME
- _ZN12RadioStationaSERKS_ @ 34 NONAME
- _ZN13RadioUiEngine10setPowerOnEv @ 35 NONAME
- _ZN13RadioUiEngine10toggleMuteEv @ 36 NONAME
- _ZN13RadioUiEngine11muteChangedEb @ 37 NONAME
- _ZN13RadioUiEngine11qt_metacallEN11QMetaObject4CallEiPPv @ 38 NONAME
- _ZN13RadioUiEngine11qt_metacastEPKc @ 39 NONAME
- _ZN13RadioUiEngine11seekStationEi @ 40 NONAME
- _ZN13RadioUiEngine11setPowerOffEi @ 41 NONAME
- _ZN13RadioUiEngine11skipStationEN11StationSkip4ModeEj @ 42 NONAME
- _ZN13RadioUiEngine12historyModelEv @ 43 NONAME
- _ZN13RadioUiEngine12setFrequencyEji @ 44 NONAME
- _ZN13RadioUiEngine12stationModelEv @ 45 NONAME
- _ZN13RadioUiEngine13genreToStringEiN11GenreTarget6TargetE @ 46 NONAME
- _ZN13RadioUiEngine13scannerEngineEv @ 47 NONAME
- _ZN13RadioUiEngine13volumeChangedEi @ 48 NONAME
- _ZN13RadioUiEngine14openMusicStoreERK16RadioHistoryItemNS_10MusicStoreE @ 49 NONAME
- _ZN13RadioUiEngine14seekingStartedEi @ 50 NONAME
- _ZN13RadioUiEngine15emitMuteChangedEb @ 51 NONAME
- _ZN13RadioUiEngine15stationsInRangeEjj @ 52 NONAME
- _ZN13RadioUiEngine16isFirstTimeStartEv @ 53 NONAME
- _ZN13RadioUiEngine16staticMetaObjectE @ 54 NONAME DATA 16
- _ZN13RadioUiEngine16toggleAudioRouteEv @ 55 NONAME
- _ZN13RadioUiEngine16tunedToFrequencyEji @ 56 NONAME
- _ZN13RadioUiEngine17addRecognizedSongERK7QStringS2_RK12RadioStation @ 57 NONAME
- _ZN13RadioUiEngine17audioRouteChangedEb @ 58 NONAME
- _ZN13RadioUiEngine17emitVolumeChangedEi @ 59 NONAME
+ _ZN12RadioStation5resetEv @ 15 NONAME
+ _ZN12RadioStation6setUrlERK7QString @ 16 NONAME
+ _ZN12RadioStation7setNameERK7QString @ 17 NONAME
+ _ZN12RadioStation7setTypeE6QFlagsINS_8TypeFlagEE @ 18 NONAME
+ _ZN12RadioStation8setGenreEi @ 19 NONAME
+ _ZN12RadioStation9setPiCodeEiN11RadioRegion6RegionE @ 20 NONAME
+ _ZN12RadioStation9setPsTypeE6QFlagsINS_10PsTypeFlagEE @ 21 NONAME
+ _ZN12RadioStation9unsetTypeE6QFlagsINS_8TypeFlagEE @ 22 NONAME
+ _ZN12RadioStationC1ERKS_ @ 23 NONAME
+ _ZN12RadioStationC1Eij @ 24 NONAME
+ _ZN12RadioStationC1Ev @ 25 NONAME
+ _ZN12RadioStationC2ERKS_ @ 26 NONAME
+ _ZN12RadioStationC2Eij @ 27 NONAME
+ _ZN12RadioStationC2Ev @ 28 NONAME
+ _ZN12RadioStationD0Ev @ 29 NONAME
+ _ZN12RadioStationD1Ev @ 30 NONAME
+ _ZN12RadioStationD2Ev @ 31 NONAME
+ _ZN12RadioStationaSERKS_ @ 32 NONAME
+ _ZN13RadioUiEngine10setPowerOnEv @ 33 NONAME
+ _ZN13RadioUiEngine10toggleMuteEv @ 34 NONAME
+ _ZN13RadioUiEngine11muteChangedEb @ 35 NONAME
+ _ZN13RadioUiEngine11qt_metacallEN11QMetaObject4CallEiPPv @ 36 NONAME
+ _ZN13RadioUiEngine11qt_metacastEPKc @ 37 NONAME
+ _ZN13RadioUiEngine11seekStationEi @ 38 NONAME
+ _ZN13RadioUiEngine11setPowerOffEi @ 39 NONAME
+ _ZN13RadioUiEngine11skipStationEN11StationSkip4ModeEj @ 40 NONAME
+ _ZN13RadioUiEngine12historyModelEv @ 41 NONAME
+ _ZN13RadioUiEngine12setFrequencyEji @ 42 NONAME
+ _ZN13RadioUiEngine12stationModelEv @ 43 NONAME
+ _ZN13RadioUiEngine13genreToStringEiN11GenreTarget6TargetE @ 44 NONAME
+ _ZN13RadioUiEngine13launchBrowserERK7QString @ 45 NONAME
+ _ZN13RadioUiEngine13scannerEngineEv @ 46 NONAME
+ _ZN13RadioUiEngine13volumeChangedEi @ 47 NONAME
+ _ZN13RadioUiEngine14openMusicStoreERK16RadioHistoryItemNS_10MusicStoreE @ 48 NONAME
+ _ZN13RadioUiEngine14seekingStartedEi @ 49 NONAME
+ _ZN13RadioUiEngine15emitMuteChangedEb @ 50 NONAME
+ _ZN13RadioUiEngine15stationsInRangeEjj @ 51 NONAME
+ _ZN13RadioUiEngine16isFirstTimeStartEv @ 52 NONAME
+ _ZN13RadioUiEngine16staticMetaObjectE @ 53 NONAME DATA 16
+ _ZN13RadioUiEngine16toggleAudioRouteEv @ 54 NONAME
+ _ZN13RadioUiEngine16tunedToFrequencyEji @ 55 NONAME
+ _ZN13RadioUiEngine17addRecognizedSongERK7QStringS2_RK12RadioStation @ 56 NONAME
+ _ZN13RadioUiEngine17audioRouteChangedEb @ 57 NONAME
+ _ZN13RadioUiEngine17emitVolumeChangedEi @ 58 NONAME
+ _ZN13RadioUiEngine17launchRadioServerEv @ 59 NONAME
_ZN13RadioUiEngine17powerOffRequestedEv @ 60 NONAME
_ZN13RadioUiEngine17setManualSeekModeEb @ 61 NONAME
_ZN13RadioUiEngine18emitSeekingStartedEN4Seek9DirectionE @ 62 NONAME
- _ZN13RadioUiEngine18lastTunedFrequencyEv @ 63 NONAME
+ _ZN13RadioUiEngine18lastTunedFrequencyEj @ 63 NONAME
_ZN13RadioUiEngine18radioStatusChangedEb @ 64 NONAME
_ZN13RadioUiEngine19createScannerEngineEv @ 65 NONAME
_ZN13RadioUiEngine19getStaticMetaObjectEv @ 66 NONAME
@@ -87,168 +87,162 @@
_ZN16RadioHistoryItem10setStationERK7QString @ 86 NONAME
_ZN16RadioHistoryItem12setFrequencyEj @ 87 NONAME
_ZN16RadioHistoryItem14setCurrentTimeEv @ 88 NONAME
- _ZN16RadioHistoryItem23decrementReferenceCountEv @ 89 NONAME
- _ZN16RadioHistoryItem5resetEv @ 90 NONAME
- _ZN16RadioHistoryItem6detachEv @ 91 NONAME
- _ZN16RadioHistoryItem8setTitleERK7QString @ 92 NONAME
- _ZN16RadioHistoryItem9setArtistERK7QString @ 93 NONAME
- _ZN16RadioHistoryItemC1ERK7QStringS2_ @ 94 NONAME
- _ZN16RadioHistoryItemC1ERKS_ @ 95 NONAME
- _ZN16RadioHistoryItemC1Ev @ 96 NONAME
- _ZN16RadioHistoryItemC2ERK7QStringS2_ @ 97 NONAME
- _ZN16RadioHistoryItemC2ERKS_ @ 98 NONAME
- _ZN16RadioHistoryItemC2Ev @ 99 NONAME
- _ZN16RadioHistoryItemD0Ev @ 100 NONAME
- _ZN16RadioHistoryItemD1Ev @ 101 NONAME
- _ZN16RadioHistoryItemD2Ev @ 102 NONAME
- _ZN16RadioHistoryItemaSERKS_ @ 103 NONAME
- _ZN17RadioHistoryModel11qt_metacallEN11QMetaObject4CallEiPPv @ 104 NONAME
- _ZN17RadioHistoryModel11qt_metacastEPKc @ 105 NONAME
- _ZN17RadioHistoryModel13emitItemAddedEv @ 106 NONAME
- _ZN17RadioHistoryModel13setShowTaggedEb @ 107 NONAME
- _ZN17RadioHistoryModel13toggleTaggingERK16RadioHistoryItemi @ 108 NONAME
- _ZN17RadioHistoryModel14setShowDetailsEb @ 109 NONAME
- _ZN17RadioHistoryModel16addRadioTextPlusEiRK7QStringRK12RadioStation @ 110 NONAME
- _ZN17RadioHistoryModel16currentSongResetEv @ 111 NONAME
- _ZN17RadioHistoryModel16resetCurrentSongEv @ 112 NONAME
- _ZN17RadioHistoryModel16staticMetaObjectE @ 113 NONAME DATA 16
- _ZN17RadioHistoryModel17reportChangedDataEii @ 114 NONAME
- _ZN17RadioHistoryModel18clearRadioTextPlusEv @ 115 NONAME
- _ZN17RadioHistoryModel19getStaticMetaObjectEv @ 116 NONAME
- _ZN17RadioHistoryModel7addItemERK7QStringS2_RK12RadioStation @ 117 NONAME
- _ZN17RadioHistoryModel8setIconsERK5QIconS2_ @ 118 NONAME
- _ZN17RadioHistoryModel9itemAddedEv @ 119 NONAME
- _ZN17RadioHistoryModel9removeAllEb @ 120 NONAME
- _ZN17RadioHistoryModelC1ER13RadioUiEngine @ 121 NONAME
- _ZN17RadioHistoryModelC2ER13RadioUiEngine @ 122 NONAME
- _ZN17RadioHistoryModelD0Ev @ 123 NONAME
- _ZN17RadioHistoryModelD1Ev @ 124 NONAME
- _ZN17RadioHistoryModelD2Ev @ 125 NONAME
- _ZN17RadioStationModel10addStationERK12RadioStation @ 126 NONAME
- _ZN17RadioStationModel10initializeEP18RadioPresetStorageP18RadioEngineWrapper @ 127 NONAME
- _ZN17RadioStationModel11findClosestEjN11StationSkip4ModeE @ 128 NONAME
- _ZN17RadioStationModel11qt_metacallEN11QMetaObject4CallEiPPv @ 129 NONAME
- _ZN17RadioStationModel11qt_metacastEPKc @ 130 NONAME
- _ZN17RadioStationModel11saveStationER12RadioStation @ 131 NONAME
- _ZN17RadioStationModel12setFavoritesERK5QListI11QModelIndexE @ 132 NONAME
- _ZN17RadioStationModel13favoriteCountEv @ 133 NONAME
- _ZN17RadioStationModel13removeStationERK12RadioStation @ 134 NONAME
- _ZN17RadioStationModel13renameStationEiRK7QString @ 135 NONAME
- _ZN17RadioStationModel14currentStationEv @ 136 NONAME
- _ZN17RadioStationModel15emitDataChangedERK12RadioStation @ 137 NONAME
- _ZN17RadioStationModel15favoriteChangedERK12RadioStation @ 138 NONAME
- _ZN17RadioStationModel15findPresetIndexEi @ 139 NONAME
- _ZN17RadioStationModel15findPresetIndexEiR12RadioStation @ 140 NONAME
- _ZN17RadioStationModel15stationsInRangeEjj @ 141 NONAME
- _ZN17RadioStationModel16dynamicPsChangedERK12RadioStation @ 142 NONAME
- _ZN17RadioStationModel16staticMetaObjectE @ 143 NONAME DATA 16
- _ZN17RadioStationModel16stationHandlerIfEv @ 144 NONAME
- _ZN17RadioStationModel17emitChangeSignalsERK12RadioStation6QFlagsINS0_10ChangeFlagEE @ 145 NONAME
- _ZN17RadioStationModel17radioTextReceivedERK12RadioStation @ 146 NONAME
- _ZN17RadioStationModel17removeByFrequencyEj @ 147 NONAME
- _ZN17RadioStationModel18findCurrentStationEj @ 148 NONAME
- _ZN17RadioStationModel18indexFromFrequencyEj @ 149 NONAME
- _ZN17RadioStationModel18stationDataChangedERK12RadioStation @ 150 NONAME
- _ZN17RadioStationModel19dynamicPsCheckEndedEv @ 151 NONAME
- _ZN17RadioStationModel19getStaticMetaObjectEv @ 152 NONAME
- _ZN17RadioStationModel19removeByPresetIndexEi @ 153 NONAME
- _ZN17RadioStationModel19setFavoriteByPresetEib @ 154 NONAME
- _ZN17RadioStationModel21findUnusedPresetIndexEv @ 155 NONAME
- _ZN17RadioStationModel22setFavoriteByFrequencyEjb @ 156 NONAME
- _ZN17RadioStationModel7setDataERK11QModelIndexRK8QVarianti @ 157 NONAME
- _ZN17RadioStationModel8setIconsERK5QIconS2_ @ 158 NONAME
- _ZN17RadioStationModel9removeAllENS_10RemoveModeE @ 159 NONAME
- _ZN17RadioStationModel9setDetailE6QFlagsINS_10DetailFlagEE @ 160 NONAME
- _ZN17RadioStationModelC1ER20RadioUiEnginePrivate @ 161 NONAME
- _ZN17RadioStationModelC2ER20RadioUiEnginePrivate @ 162 NONAME
- _ZN17RadioStationModelD0Ev @ 163 NONAME
- _ZN17RadioStationModelD1Ev @ 164 NONAME
- _ZN17RadioStationModelD2Ev @ 165 NONAME
- _ZN18RadioScannerEngine11qt_metacallEN11QMetaObject4CallEiPPv @ 166 NONAME
- _ZN18RadioScannerEngine11qt_metacastEPKc @ 167 NONAME
- _ZN18RadioScannerEngine12stationFoundERK12RadioStation @ 168 NONAME
- _ZN18RadioScannerEngine13startScanningEv @ 169 NONAME
- _ZN18RadioScannerEngine16continueScanningEv @ 170 NONAME
- _ZN18RadioScannerEngine16emitStationFoundERK12RadioStation @ 171 NONAME
- _ZN18RadioScannerEngine16staticMetaObjectE @ 172 NONAME DATA 16
- _ZN18RadioScannerEngine19addScannedFrequencyEj @ 173 NONAME
- _ZN18RadioScannerEngine19getStaticMetaObjectEv @ 174 NONAME
- _ZN18RadioScannerEngine6cancelEv @ 175 NONAME
- _ZN18RadioScannerEngineC1ER20RadioUiEnginePrivate @ 176 NONAME
- _ZN18RadioScannerEngineC2ER20RadioUiEnginePrivate @ 177 NONAME
- _ZN18RadioScannerEngineD0Ev @ 178 NONAME
- _ZN18RadioScannerEngineD1Ev @ 179 NONAME
- _ZN18RadioScannerEngineD2Ev @ 180 NONAME
- _ZNK12RadioStation10hasChangedEv @ 181 NONAME
- _ZNK12RadioStation10isDetachedEv @ 182 NONAME
- _ZNK12RadioStation10isFavoriteEv @ 183 NONAME
- _ZNK12RadioStation11changeFlagsEv @ 184 NONAME
- _ZNK12RadioStation11presetIndexEv @ 185 NONAME
- _ZNK12RadioStation12frequencyMhzEv @ 186 NONAME
- _ZNK12RadioStation13dynamicPsTextEv @ 187 NONAME
- _ZNK12RadioStation14hasDataChangedE6QFlagsINS_10ChangeFlagEE @ 188 NONAME
- _ZNK12RadioStation18nameOrFrequencyMhzEv @ 189 NONAME
- _ZNK12RadioStation3urlEv @ 190 NONAME
- _ZNK12RadioStation4nameEv @ 191 NONAME
- _ZNK12RadioStation5genreEv @ 192 NONAME
- _ZNK12RadioStation6hasRdsEv @ 193 NONAME
- _ZNK12RadioStation6isTypeE6QFlagsINS_8TypeFlagEE @ 194 NONAME
- _ZNK12RadioStation6psTypeEv @ 195 NONAME
- _ZNK12RadioStation7isValidEv @ 196 NONAME
- _ZNK12RadioStation9frequencyEv @ 197 NONAME
- _ZNK12RadioStation9hasPiCodeEv @ 198 NONAME
- _ZNK12RadioStation9isRenamedEv @ 199 NONAME
- _ZNK12RadioStation9radioTextEv @ 200 NONAME
- _ZNK13RadioUiEngine10isScanningEv @ 201 NONAME
- _ZNK13RadioUiEngine10metaObjectEv @ 202 NONAME
- _ZNK13RadioUiEngine12maxFrequencyEv @ 203 NONAME
- _ZNK13RadioUiEngine12minFrequencyEv @ 204 NONAME
- _ZNK13RadioUiEngine13isInitializedEv @ 205 NONAME
- _ZNK13RadioUiEngine13isPoweringOffEv @ 206 NONAME
- _ZNK13RadioUiEngine16currentFrequencyEv @ 207 NONAME
- _ZNK13RadioUiEngine17frequencyStepSizeEv @ 208 NONAME
- _ZNK13RadioUiEngine17isAntennaAttachedEv @ 209 NONAME
- _ZNK13RadioUiEngine18isInManualSeekModeEv @ 210 NONAME
- _ZNK13RadioUiEngine18isUsingLoudspeakerEv @ 211 NONAME
- _ZNK13RadioUiEngine6regionEv @ 212 NONAME
- _ZNK13RadioUiEngine7isMutedEv @ 213 NONAME
- _ZNK13RadioUiEngine9isRadioOnEv @ 214 NONAME
- _ZNK16RadioHistoryItem10isDetachedEv @ 215 NONAME
- _ZNK16RadioHistoryItem17isRecognizedByRdsEv @ 216 NONAME
- _ZNK16RadioHistoryItem2idEv @ 217 NONAME
- _ZNK16RadioHistoryItem4timeEv @ 218 NONAME
- _ZNK16RadioHistoryItem5titleEv @ 219 NONAME
- _ZNK16RadioHistoryItem6artistEv @ 220 NONAME
- _ZNK16RadioHistoryItem7isValidEv @ 221 NONAME
- _ZNK16RadioHistoryItem7stationEv @ 222 NONAME
- _ZNK16RadioHistoryItem8isTaggedEv @ 223 NONAME
- _ZNK16RadioHistoryItem9frequencyEv @ 224 NONAME
- _ZNK17RadioHistoryModel10metaObjectEv @ 225 NONAME
- _ZNK17RadioHistoryModel11itemAtIndexERK11QModelIndex @ 226 NONAME
- _ZNK17RadioHistoryModel23isCurrentSongRecognizedEv @ 227 NONAME
- _ZNK17RadioHistoryModel4dataERK11QModelIndexi @ 228 NONAME
- _ZNK17RadioHistoryModel8rowCountERK11QModelIndex @ 229 NONAME
- _ZNK17RadioStationModel10metaObjectEv @ 230 NONAME
- _ZNK17RadioStationModel13findFrequencyEjR12RadioStation @ 231 NONAME
- _ZNK17RadioStationModel14currentStationEv @ 232 NONAME
- _ZNK17RadioStationModel4dataERK11QModelIndexi @ 233 NONAME
- _ZNK17RadioStationModel4listEv @ 234 NONAME
- _ZNK17RadioStationModel5flagsERK11QModelIndex @ 235 NONAME
- _ZNK17RadioStationModel8containsEj @ 236 NONAME
- _ZNK17RadioStationModel8rowCountERK11QModelIndex @ 237 NONAME
- _ZNK17RadioStationModel9stationAtEi @ 238 NONAME
- _ZNK18RadioScannerEngine10isScanningEv @ 239 NONAME
- _ZNK18RadioScannerEngine10metaObjectEv @ 240 NONAME
- _ZTI12RadioStation @ 241 NONAME
- _ZTI13RadioUiEngine @ 242 NONAME
- _ZTI16RadioHistoryItem @ 243 NONAME
- _ZTI17RadioHistoryModel @ 244 NONAME
- _ZTI17RadioStationModel @ 245 NONAME
- _ZTI18RadioScannerEngine @ 246 NONAME
- _ZTV12RadioStation @ 247 NONAME
- _ZTV13RadioUiEngine @ 248 NONAME
- _ZTV16RadioHistoryItem @ 249 NONAME
- _ZTV17RadioHistoryModel @ 250 NONAME
- _ZTV17RadioStationModel @ 251 NONAME
- _ZTV18RadioScannerEngine @ 252 NONAME
+ _ZN16RadioHistoryItem5resetEv @ 89 NONAME
+ _ZN16RadioHistoryItem8setTitleERK7QString @ 90 NONAME
+ _ZN16RadioHistoryItem9setArtistERK7QString @ 91 NONAME
+ _ZN16RadioHistoryItemC1ERK7QStringS2_ @ 92 NONAME
+ _ZN16RadioHistoryItemC1ERKS_ @ 93 NONAME
+ _ZN16RadioHistoryItemC1Ev @ 94 NONAME
+ _ZN16RadioHistoryItemC2ERK7QStringS2_ @ 95 NONAME
+ _ZN16RadioHistoryItemC2ERKS_ @ 96 NONAME
+ _ZN16RadioHistoryItemC2Ev @ 97 NONAME
+ _ZN16RadioHistoryItemD1Ev @ 98 NONAME
+ _ZN16RadioHistoryItemD2Ev @ 99 NONAME
+ _ZN16RadioHistoryItemaSERKS_ @ 100 NONAME
+ _ZN17RadioHistoryModel11qt_metacallEN11QMetaObject4CallEiPPv @ 101 NONAME
+ _ZN17RadioHistoryModel11qt_metacastEPKc @ 102 NONAME
+ _ZN17RadioHistoryModel13emitItemAddedEv @ 103 NONAME
+ _ZN17RadioHistoryModel13setShowTaggedEb @ 104 NONAME
+ _ZN17RadioHistoryModel13toggleTaggingERK16RadioHistoryItemi @ 105 NONAME
+ _ZN17RadioHistoryModel14setShowDetailsEb @ 106 NONAME
+ _ZN17RadioHistoryModel16addRadioTextPlusEiRK7QStringRK12RadioStation @ 107 NONAME
+ _ZN17RadioHistoryModel16currentSongResetEv @ 108 NONAME
+ _ZN17RadioHistoryModel16resetCurrentSongEv @ 109 NONAME
+ _ZN17RadioHistoryModel16staticMetaObjectE @ 110 NONAME DATA 16
+ _ZN17RadioHistoryModel17reportChangedDataEii @ 111 NONAME
+ _ZN17RadioHistoryModel18clearRadioTextPlusEv @ 112 NONAME
+ _ZN17RadioHistoryModel19getStaticMetaObjectEv @ 113 NONAME
+ _ZN17RadioHistoryModel7addItemERK7QStringS2_RK12RadioStation @ 114 NONAME
+ _ZN17RadioHistoryModel8setIconsERK5QIconS2_ @ 115 NONAME
+ _ZN17RadioHistoryModel9itemAddedEv @ 116 NONAME
+ _ZN17RadioHistoryModel9removeAllEb @ 117 NONAME
+ _ZN17RadioHistoryModelC1ER13RadioUiEngine @ 118 NONAME
+ _ZN17RadioHistoryModelC2ER13RadioUiEngine @ 119 NONAME
+ _ZN17RadioHistoryModelD0Ev @ 120 NONAME
+ _ZN17RadioHistoryModelD1Ev @ 121 NONAME
+ _ZN17RadioHistoryModelD2Ev @ 122 NONAME
+ _ZN17RadioStationModel10addStationERK12RadioStation @ 123 NONAME
+ _ZN17RadioStationModel10initializeEP18RadioPresetStorageP18RadioEngineWrapper @ 124 NONAME
+ _ZN17RadioStationModel11findClosestEjN11StationSkip4ModeE @ 125 NONAME
+ _ZN17RadioStationModel11qt_metacallEN11QMetaObject4CallEiPPv @ 126 NONAME
+ _ZN17RadioStationModel11qt_metacastEPKc @ 127 NONAME
+ _ZN17RadioStationModel11saveStationER12RadioStation @ 128 NONAME
+ _ZN17RadioStationModel12setFavoritesERK5QListI11QModelIndexE @ 129 NONAME
+ _ZN17RadioStationModel13favoriteCountEv @ 130 NONAME
+ _ZN17RadioStationModel13removeStationERK12RadioStation @ 131 NONAME
+ _ZN17RadioStationModel13renameStationEiRK7QString @ 132 NONAME
+ _ZN17RadioStationModel14currentStationEv @ 133 NONAME
+ _ZN17RadioStationModel15emitDataChangedERK12RadioStation @ 134 NONAME
+ _ZN17RadioStationModel15favoriteChangedERK12RadioStation @ 135 NONAME
+ _ZN17RadioStationModel15findPresetIndexEi @ 136 NONAME
+ _ZN17RadioStationModel15findPresetIndexEiR12RadioStation @ 137 NONAME
+ _ZN17RadioStationModel15stationsInRangeEjj @ 138 NONAME
+ _ZN17RadioStationModel16dynamicPsChangedERK12RadioStation @ 139 NONAME
+ _ZN17RadioStationModel16staticMetaObjectE @ 140 NONAME DATA 16
+ _ZN17RadioStationModel16stationHandlerIfEv @ 141 NONAME
+ _ZN17RadioStationModel17emitChangeSignalsERK12RadioStation6QFlagsINS0_10ChangeFlagEE @ 142 NONAME
+ _ZN17RadioStationModel17radioTextReceivedERK12RadioStation @ 143 NONAME
+ _ZN17RadioStationModel17removeByFrequencyEj @ 144 NONAME
+ _ZN17RadioStationModel18indexFromFrequencyEj @ 145 NONAME
+ _ZN17RadioStationModel18stationDataChangedERK12RadioStation @ 146 NONAME
+ _ZN17RadioStationModel19dynamicPsCheckEndedEv @ 147 NONAME
+ _ZN17RadioStationModel19getStaticMetaObjectEv @ 148 NONAME
+ _ZN17RadioStationModel19removeByPresetIndexEi @ 149 NONAME
+ _ZN17RadioStationModel19setFavoriteByPresetEib @ 150 NONAME
+ _ZN17RadioStationModel21findUnusedPresetIndexEv @ 151 NONAME
+ _ZN17RadioStationModel22setFavoriteByFrequencyEjb @ 152 NONAME
+ _ZN17RadioStationModel7setDataERK11QModelIndexRK8QVarianti @ 153 NONAME
+ _ZN17RadioStationModel8setIconsERK5QIconS2_ @ 154 NONAME
+ _ZN17RadioStationModel9removeAllENS_10RemoveModeE @ 155 NONAME
+ _ZN17RadioStationModel9setDetailE6QFlagsINS_10DetailFlagEE @ 156 NONAME
+ _ZN17RadioStationModelC1ER20RadioUiEnginePrivate @ 157 NONAME
+ _ZN17RadioStationModelC2ER20RadioUiEnginePrivate @ 158 NONAME
+ _ZN17RadioStationModelD0Ev @ 159 NONAME
+ _ZN17RadioStationModelD1Ev @ 160 NONAME
+ _ZN17RadioStationModelD2Ev @ 161 NONAME
+ _ZN18RadioScannerEngine11qt_metacallEN11QMetaObject4CallEiPPv @ 162 NONAME
+ _ZN18RadioScannerEngine11qt_metacastEPKc @ 163 NONAME
+ _ZN18RadioScannerEngine12stationFoundERK12RadioStation @ 164 NONAME
+ _ZN18RadioScannerEngine13startScanningEv @ 165 NONAME
+ _ZN18RadioScannerEngine16continueScanningEv @ 166 NONAME
+ _ZN18RadioScannerEngine16emitStationFoundERK12RadioStation @ 167 NONAME
+ _ZN18RadioScannerEngine16staticMetaObjectE @ 168 NONAME DATA 16
+ _ZN18RadioScannerEngine19addScannedFrequencyEj @ 169 NONAME
+ _ZN18RadioScannerEngine19getStaticMetaObjectEv @ 170 NONAME
+ _ZN18RadioScannerEngine6cancelEv @ 171 NONAME
+ _ZN18RadioScannerEngineC1ER20RadioUiEnginePrivate @ 172 NONAME
+ _ZN18RadioScannerEngineC2ER20RadioUiEnginePrivate @ 173 NONAME
+ _ZN18RadioScannerEngineD0Ev @ 174 NONAME
+ _ZN18RadioScannerEngineD1Ev @ 175 NONAME
+ _ZN18RadioScannerEngineD2Ev @ 176 NONAME
+ _ZNK12RadioStation10hasChangedEv @ 177 NONAME
+ _ZNK12RadioStation10isDetachedEv @ 178 NONAME
+ _ZNK12RadioStation10isFavoriteEv @ 179 NONAME
+ _ZNK12RadioStation11changeFlagsEv @ 180 NONAME
+ _ZNK12RadioStation11presetIndexEv @ 181 NONAME
+ _ZNK12RadioStation13dynamicPsTextEv @ 182 NONAME
+ _ZNK12RadioStation14hasDataChangedE6QFlagsINS_10ChangeFlagEE @ 183 NONAME
+ _ZNK12RadioStation15frequencyStringEv @ 184 NONAME
+ _ZNK12RadioStation3urlEv @ 185 NONAME
+ _ZNK12RadioStation4nameEv @ 186 NONAME
+ _ZNK12RadioStation5genreEv @ 187 NONAME
+ _ZNK12RadioStation6isTypeE6QFlagsINS_8TypeFlagEE @ 188 NONAME
+ _ZNK12RadioStation6piCodeEv @ 189 NONAME
+ _ZNK12RadioStation6psTypeEv @ 190 NONAME
+ _ZNK12RadioStation7isValidEv @ 191 NONAME
+ _ZNK12RadioStation9frequencyEv @ 192 NONAME
+ _ZNK12RadioStation9isRenamedEv @ 193 NONAME
+ _ZNK12RadioStation9radioTextEv @ 194 NONAME
+ _ZNK13RadioUiEngine10isScanningEv @ 195 NONAME
+ _ZNK13RadioUiEngine10metaObjectEv @ 196 NONAME
+ _ZNK13RadioUiEngine12maxFrequencyEv @ 197 NONAME
+ _ZNK13RadioUiEngine12minFrequencyEv @ 198 NONAME
+ _ZNK13RadioUiEngine13isInitializedEv @ 199 NONAME
+ _ZNK13RadioUiEngine13isPoweringOffEv @ 200 NONAME
+ _ZNK13RadioUiEngine16currentFrequencyEv @ 201 NONAME
+ _ZNK13RadioUiEngine17frequencyStepSizeEv @ 202 NONAME
+ _ZNK13RadioUiEngine17isAntennaAttachedEv @ 203 NONAME
+ _ZNK13RadioUiEngine18isInManualSeekModeEv @ 204 NONAME
+ _ZNK13RadioUiEngine18isUsingLoudspeakerEv @ 205 NONAME
+ _ZNK13RadioUiEngine6regionEv @ 206 NONAME
+ _ZNK13RadioUiEngine7isMutedEv @ 207 NONAME
+ _ZNK13RadioUiEngine9isRadioOnEv @ 208 NONAME
+ _ZNK16RadioHistoryItem10isDetachedEv @ 209 NONAME
+ _ZNK16RadioHistoryItem17isRecognizedByRdsEv @ 210 NONAME
+ _ZNK16RadioHistoryItem2idEv @ 211 NONAME
+ _ZNK16RadioHistoryItem4timeEv @ 212 NONAME
+ _ZNK16RadioHistoryItem5titleEv @ 213 NONAME
+ _ZNK16RadioHistoryItem6artistEv @ 214 NONAME
+ _ZNK16RadioHistoryItem7isValidEv @ 215 NONAME
+ _ZNK16RadioHistoryItem7stationEv @ 216 NONAME
+ _ZNK16RadioHistoryItem8isTaggedEv @ 217 NONAME
+ _ZNK16RadioHistoryItem9frequencyEv @ 218 NONAME
+ _ZNK17RadioHistoryModel10metaObjectEv @ 219 NONAME
+ _ZNK17RadioHistoryModel11itemAtIndexERK11QModelIndex @ 220 NONAME
+ _ZNK17RadioHistoryModel23isCurrentSongRecognizedEv @ 221 NONAME
+ _ZNK17RadioHistoryModel4dataERK11QModelIndexi @ 222 NONAME
+ _ZNK17RadioHistoryModel8rowCountERK11QModelIndex @ 223 NONAME
+ _ZNK17RadioStationModel10metaObjectEv @ 224 NONAME
+ _ZNK17RadioStationModel11findStationEjN12FindCriteria8CriteriaE @ 225 NONAME
+ _ZNK17RadioStationModel13findFrequencyEjR12RadioStationN12FindCriteria8CriteriaE @ 226 NONAME
+ _ZNK17RadioStationModel14currentStationEv @ 227 NONAME
+ _ZNK17RadioStationModel4dataERK11QModelIndexi @ 228 NONAME
+ _ZNK17RadioStationModel4listEv @ 229 NONAME
+ _ZNK17RadioStationModel5flagsERK11QModelIndex @ 230 NONAME
+ _ZNK17RadioStationModel8containsEj @ 231 NONAME
+ _ZNK17RadioStationModel8rowCountERK11QModelIndex @ 232 NONAME
+ _ZNK17RadioStationModel9stationAtEi @ 233 NONAME
+ _ZNK18RadioScannerEngine10isScanningEv @ 234 NONAME
+ _ZNK18RadioScannerEngine10metaObjectEv @ 235 NONAME
+ _ZTI12RadioStation @ 236 NONAME
+ _ZTI13RadioUiEngine @ 237 NONAME
+ _ZTI17RadioHistoryModel @ 238 NONAME
+ _ZTI17RadioStationModel @ 239 NONAME
+ _ZTI18RadioScannerEngine @ 240 NONAME
+ _ZTV12RadioStation @ 241 NONAME
+ _ZTV13RadioUiEngine @ 242 NONAME
+ _ZTV17RadioHistoryModel @ 243 NONAME
+ _ZTV17RadioStationModel @ 244 NONAME
+ _ZTV18RadioScannerEngine @ 245 NONAME
+ _ZN13RadioUiEngine10lastVolumeEv @ 246 NONAME
--- a/radioapp/eabi/fmradiowidgetsu.def Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/eabi/fmradiowidgetsu.def Fri Jun 25 19:09:05 2010 +0300
@@ -48,105 +48,122 @@
_ZN19RadioFrequencyStrip13initPositionsEv @ 47 NONAME
_ZN19RadioFrequencyStrip13removeStationERK11QModelIndexii @ 48 NONAME
_ZN19RadioFrequencyStrip13seekRequestedEi @ 49 NONAME
- _ZN19RadioFrequencyStrip13skipRequestedEi @ 50 NONAME
- _ZN19RadioFrequencyStrip13updateStationERK11QModelIndexii @ 51 NONAME
- _ZN19RadioFrequencyStrip14initEmptyItemsEv @ 52 NONAME
- _ZN19RadioFrequencyStrip14updateAllItemsEv @ 53 NONAME
- _ZN19RadioFrequencyStrip14updateFavoriteERK12RadioStation @ 54 NONAME
- _ZN19RadioFrequencyStrip15addFrequencyPosEijP18RadioFrequencyItem @ 55 NONAME
- _ZN19RadioFrequencyStrip15mousePressEventEP24QGraphicsSceneMouseEvent @ 56 NONAME
- _ZN19RadioFrequencyStrip15setScanningModeEb @ 57 NONAME
- _ZN19RadioFrequencyStrip16cancelManualSeekEv @ 58 NONAME
- _ZN19RadioFrequencyStrip16frequencyChangedEjii @ 59 NONAME
- _ZN19RadioFrequencyStrip16handleLeftButtonEv @ 60 NONAME
- _ZN19RadioFrequencyStrip16scrollPosChangedE7QPointF @ 61 NONAME
- _ZN19RadioFrequencyStrip16staticMetaObjectE @ 62 NONAME DATA 16
- _ZN19RadioFrequencyStrip16toggleManualSeekEv @ 63 NONAME
- _ZN19RadioFrequencyStrip17addScannedStationERK12RadioStation @ 64 NONAME
- _ZN19RadioFrequencyStrip17handleRightButtonEv @ 65 NONAME
- _ZN19RadioFrequencyStrip17manualSeekChangedEb @ 66 NONAME
- _ZN19RadioFrequencyStrip17mouseReleaseEventEP24QGraphicsSceneMouseEvent @ 67 NONAME
- _ZN19RadioFrequencyStrip17scrollToFrequencyEjN6Scroll9DirectionEiN10TuneReason6ReasonE @ 68 NONAME
- _ZN19RadioFrequencyStrip18handleScrollingEndEv @ 69 NONAME
- _ZN19RadioFrequencyStrip19createItemPrimitiveEP13QGraphicsItem @ 70 NONAME
- _ZN19RadioFrequencyStrip19getStaticMetaObjectEv @ 71 NONAME
- _ZN19RadioFrequencyStrip19updateItemPrimitiveEP13QGraphicsItemi @ 72 NONAME
- _ZN19RadioFrequencyStrip20emitFrequencyChangedEj @ 73 NONAME
- _ZN19RadioFrequencyStrip20handleLongLeftButtonEv @ 74 NONAME
- _ZN19RadioFrequencyStrip21handleLongRightButtonEv @ 75 NONAME
- _ZN19RadioFrequencyStrip21updateStationsInRangeEiib @ 76 NONAME
- _ZN19RadioFrequencyStrip4initEP13RadioUiEngineR13RadioUiLoader @ 77 NONAME
- _ZN19RadioFrequencyStrip9initModelEv @ 78 NONAME
- _ZN19RadioFrequencyStripC1Ev @ 79 NONAME
- _ZN19RadioFrequencyStripC2Ev @ 80 NONAME
- _ZN20RadioStationCarousel10timerFiredEv @ 81 NONAME
- _ZN20RadioStationCarousel11qt_metacallEN11QMetaObject4CallEiPPv @ 82 NONAME
- _ZN20RadioStationCarousel11qt_metacastEPKc @ 83 NONAME
- _ZN20RadioStationCarousel11resizeEventEP25QGraphicsSceneResizeEvent @ 84 NONAME
- _ZN20RadioStationCarousel11setInfoTextEN16CarouselInfoText4TypeE @ 85 NONAME
- _ZN20RadioStationCarousel12cleanRdsDataEv @ 86 NONAME
- _ZN20RadioStationCarousel12gestureEventEP13QGestureEvent @ 87 NONAME
- _ZN20RadioStationCarousel12setFrequencyEjiN6Scroll9DirectionE @ 88 NONAME
- _ZN20RadioStationCarousel13clearInfoTextEv @ 89 NONAME
- _ZN20RadioStationCarousel13scrollToIndexEiN6Scroll9DirectionE6QFlagsINS_10ScrollFlagEE @ 90 NONAME
- _ZN20RadioStationCarousel13skipRequestedEi @ 91 NONAME
- _ZN20RadioStationCarousel14setCenterIndexEi6QFlagsINS_10ScrollFlagEE @ 92 NONAME
- _ZN20RadioStationCarousel14toggleFavoriteEv @ 93 NONAME
- _ZN20RadioStationCarousel14updateStationsEv @ 94 NONAME
- _ZN20RadioStationCarousel15cancelAnimationEv @ 95 NONAME
- _ZN20RadioStationCarousel15mousePressEventEP24QGraphicsSceneMouseEvent @ 96 NONAME
- _ZN20RadioStationCarousel15setFavoriteIconERK6HbIcon @ 97 NONAME
- _ZN20RadioStationCarousel15setScanningModeEb @ 98 NONAME
- _ZN20RadioStationCarousel15updateRadioTextERK12RadioStation @ 99 NONAME
- _ZN20RadioStationCarousel16frequencyChangedEjii @ 100 NONAME
- _ZN20RadioStationCarousel16scrollPosChangedERK7QPointF @ 101 NONAME
- _ZN20RadioStationCarousel16staticMetaObjectE @ 102 NONAME DATA 16
- _ZN20RadioStationCarousel17adjustAfterScrollEv @ 103 NONAME
- _ZN20RadioStationCarousel17animateNewStationERK12RadioStation @ 104 NONAME
- _ZN20RadioStationCarousel17setAutoScrollTimeEi @ 105 NONAME
- _ZN20RadioStationCarousel17setManualSeekModeEb @ 106 NONAME
- _ZN20RadioStationCarousel18setNonFavoriteIconERK6HbIcon @ 107 NONAME
- _ZN20RadioStationCarousel19calculateDifferenceEiRN6Scroll9DirectionE @ 108 NONAME
- _ZN20RadioStationCarousel19getStaticMetaObjectEv @ 109 NONAME
- _ZN20RadioStationCarousel19updateAntennaStatusEb @ 110 NONAME
- _ZN20RadioStationCarousel21scanAnimationFinishedEv @ 111 NONAME
- _ZN20RadioStationCarousel24setAlternateSkippingModeEb @ 112 NONAME
- _ZN20RadioStationCarousel4initER13RadioUiLoaderP13RadioUiEngine @ 113 NONAME
- _ZN20RadioStationCarousel4skipEN11StationSkip4ModeE @ 114 NONAME
- _ZN20RadioStationCarousel6updateERK12RadioStation @ 115 NONAME
- _ZN20RadioStationCarousel8uiEngineEv @ 116 NONAME
- _ZN20RadioStationCarousel9adjustPosEi @ 117 NONAME
- _ZN20RadioStationCarousel9nextIndexEi @ 118 NONAME
- _ZN20RadioStationCarousel9prevIndexEi @ 119 NONAME
- _ZN20RadioStationCarousel9showEventEP10QShowEvent @ 120 NONAME
- _ZN20RadioStationCarousel9trimIndexEi @ 121 NONAME
- _ZN20RadioStationCarouselC1EP13QGraphicsItem @ 122 NONAME
- _ZN20RadioStationCarouselC2EP13QGraphicsItem @ 123 NONAME
- _ZNK11RadioWindow10metaObjectEv @ 124 NONAME
- _ZNK16RadioFadingLabel10metaObjectEv @ 125 NONAME
- _ZNK19RadioFrequencyStrip10metaObjectEv @ 126 NONAME
- _ZNK19RadioFrequencyStrip11selectorPosEv @ 127 NONAME
- _ZNK19RadioFrequencyStrip18isInManualSeekModeEv @ 128 NONAME
- _ZNK19RadioFrequencyStrip9frequencyEv @ 129 NONAME
- _ZNK20RadioStationCarousel10metaObjectEv @ 130 NONAME
- _ZNK20RadioStationCarousel12favoriteIconEv @ 131 NONAME
- _ZNK20RadioStationCarousel13isInitializedEv @ 132 NONAME
- _ZNK20RadioStationCarousel14autoScrollTimeEv @ 133 NONAME
- _ZNK20RadioStationCarousel15nonFavoriteIconEv @ 134 NONAME
- _ZNK20RadioStationCarousel16isInScanningModeEv @ 135 NONAME
- _ZNK20RadioStationCarousel17isAntennaAttachedEv @ 136 NONAME
- _ZNK20RadioStationCarousel18isScrollingAllowedEv @ 137 NONAME
- _ZTI11RadioWindow @ 138 NONAME
- _ZTI16RadioFadingLabel @ 139 NONAME
- _ZTI19RadioFrequencyStrip @ 140 NONAME
- _ZTI20RadioStationCarousel @ 141 NONAME
- _ZTV11RadioWindow @ 142 NONAME
- _ZTV16RadioFadingLabel @ 143 NONAME
- _ZTV19RadioFrequencyStrip @ 144 NONAME
- _ZTV20RadioStationCarousel @ 145 NONAME
- _ZThn8_N11RadioWindowD0Ev @ 146 NONAME
- _ZThn8_N11RadioWindowD1Ev @ 147 NONAME
- _ZThn8_N19RadioFrequencyStrip15mousePressEventEP24QGraphicsSceneMouseEvent @ 148 NONAME
- _ZThn8_N19RadioFrequencyStrip17mouseReleaseEventEP24QGraphicsSceneMouseEvent @ 149 NONAME
- _ZThn8_N20RadioStationCarousel15mousePressEventEP24QGraphicsSceneMouseEvent @ 150 NONAME
+ _ZN19RadioFrequencyStrip13setItemHeightEi @ 50 NONAME
+ _ZN19RadioFrequencyStrip13skipRequestedEi @ 51 NONAME
+ _ZN19RadioFrequencyStrip13updateStationERK11QModelIndexii @ 52 NONAME
+ _ZN19RadioFrequencyStrip14initEmptyItemsEv @ 53 NONAME
+ _ZN19RadioFrequencyStrip14updateAllItemsEv @ 54 NONAME
+ _ZN19RadioFrequencyStrip14updateFavoriteERK12RadioStation @ 55 NONAME
+ _ZN19RadioFrequencyStrip15addFrequencyPosEijP18RadioFrequencyItem @ 56 NONAME
+ _ZN19RadioFrequencyStrip15mousePressEventEP24QGraphicsSceneMouseEvent @ 57 NONAME
+ _ZN19RadioFrequencyStrip15setScanningModeEb @ 58 NONAME
+ _ZN19RadioFrequencyStrip16cancelManualSeekEv @ 59 NONAME
+ _ZN19RadioFrequencyStrip16frequencyChangedEjii @ 60 NONAME
+ _ZN19RadioFrequencyStrip16handleLeftButtonEv @ 61 NONAME
+ _ZN19RadioFrequencyStrip16scrollPosChangedEv @ 62 NONAME
+ _ZN19RadioFrequencyStrip16staticMetaObjectE @ 63 NONAME DATA 16
+ _ZN19RadioFrequencyStrip16toggleManualSeekEv @ 64 NONAME
+ _ZN19RadioFrequencyStrip17addScannedStationERK12RadioStation @ 65 NONAME
+ _ZN19RadioFrequencyStrip17handleRightButtonEv @ 66 NONAME
+ _ZN19RadioFrequencyStrip17manualSeekChangedEb @ 67 NONAME
+ _ZN19RadioFrequencyStrip17mouseReleaseEventEP24QGraphicsSceneMouseEvent @ 68 NONAME
+ _ZN19RadioFrequencyStrip17scrollToFrequencyEjN6Scroll9DirectionEiN10TuneReason6ReasonE @ 69 NONAME
+ _ZN19RadioFrequencyStrip18handleScrollingEndEv @ 70 NONAME
+ _ZN19RadioFrequencyStrip19createItemPrimitiveEP13QGraphicsItem @ 71 NONAME
+ _ZN19RadioFrequencyStrip19getStaticMetaObjectEv @ 72 NONAME
+ _ZN19RadioFrequencyStrip19updateItemPrimitiveEP13QGraphicsItemi @ 73 NONAME
+ _ZN19RadioFrequencyStrip20emitFrequencyChangedEj @ 74 NONAME
+ _ZN19RadioFrequencyStrip20handleLongLeftButtonEv @ 75 NONAME
+ _ZN19RadioFrequencyStrip21handleLongRightButtonEv @ 76 NONAME
+ _ZN19RadioFrequencyStrip21updateStationsInRangeEiib @ 77 NONAME
+ _ZN19RadioFrequencyStrip4initEP13RadioUiEngineR13RadioUiLoader @ 78 NONAME
+ _ZN19RadioFrequencyStrip9initModelEv @ 79 NONAME
+ _ZN19RadioFrequencyStripC1Ev @ 80 NONAME
+ _ZN19RadioFrequencyStripC2Ev @ 81 NONAME
+ _ZN20RadioStationCarousel10timerFiredEv @ 82 NONAME
+ _ZN20RadioStationCarousel11findStationEj @ 83 NONAME
+ _ZN20RadioStationCarousel11qt_metacallEN11QMetaObject4CallEiPPv @ 84 NONAME
+ _ZN20RadioStationCarousel11qt_metacastEPKc @ 85 NONAME
+ _ZN20RadioStationCarousel11resizeEventEP25QGraphicsSceneResizeEvent @ 86 NONAME
+ _ZN20RadioStationCarousel11setInfoTextEN16CarouselInfoText4TypeE @ 87 NONAME
+ _ZN20RadioStationCarousel12cleanRdsDataEv @ 88 NONAME
+ _ZN20RadioStationCarousel12gestureEventEP13QGestureEvent @ 89 NONAME
+ _ZN20RadioStationCarousel12setFrequencyEjiN6Scroll9DirectionE @ 90 NONAME
+ _ZN20RadioStationCarousel13clearInfoTextEv @ 91 NONAME
+ _ZN20RadioStationCarousel13drawOffScreenER8QPainter @ 92 NONAME
+ _ZN20RadioStationCarousel13localizeGenreEi @ 93 NONAME
+ _ZN20RadioStationCarousel13scrollToIndexEiN6Scroll9DirectionE6QFlagsINS_10ScrollFlagEE @ 94 NONAME
+ _ZN20RadioStationCarousel13skipRequestedEi @ 95 NONAME
+ _ZN20RadioStationCarousel14setCenterIndexEi6QFlagsINS_10ScrollFlagEE @ 96 NONAME
+ _ZN20RadioStationCarousel14updateStationsEv @ 97 NONAME
+ _ZN20RadioStationCarousel15cancelAnimationEv @ 98 NONAME
+ _ZN20RadioStationCarousel15mousePressEventEP24QGraphicsSceneMouseEvent @ 99 NONAME
+ _ZN20RadioStationCarousel15setFavoriteIconERK6HbIcon @ 100 NONAME
+ _ZN20RadioStationCarousel15setScanningModeEb @ 101 NONAME
+ _ZN20RadioStationCarousel15updateRadioTextERK12RadioStation @ 102 NONAME
+ _ZN20RadioStationCarousel16frequencyChangedEjii @ 103 NONAME
+ _ZN20RadioStationCarousel16handleUrlClickedERK12RadioStation @ 104 NONAME
+ _ZN20RadioStationCarousel16scrollPosChangedERK7QPointF @ 105 NONAME
+ _ZN20RadioStationCarousel16staticMetaObjectE @ 106 NONAME DATA 16
+ _ZN20RadioStationCarousel17adjustAfterScrollEv @ 107 NONAME
+ _ZN20RadioStationCarousel17animateNewStationERK12RadioStation @ 108 NONAME
+ _ZN20RadioStationCarousel17handleIconClickedERK12RadioStation @ 109 NONAME
+ _ZN20RadioStationCarousel17setAutoScrollTimeEi @ 110 NONAME
+ _ZN20RadioStationCarousel17setManualSeekModeEb @ 111 NONAME
+ _ZN20RadioStationCarousel18setNonFavoriteIconERK6HbIcon @ 112 NONAME
+ _ZN20RadioStationCarousel19calculateDifferenceEiRN6Scroll9DirectionE @ 113 NONAME
+ _ZN20RadioStationCarousel19getStaticMetaObjectEv @ 114 NONAME
+ _ZN20RadioStationCarousel19updateAntennaStatusEb @ 115 NONAME
+ _ZN20RadioStationCarousel21scanAnimationFinishedEv @ 116 NONAME
+ _ZN20RadioStationCarousel22handleRadiotextClickedERK12RadioStation @ 117 NONAME
+ _ZN20RadioStationCarousel24setAlternateSkippingModeEb @ 118 NONAME
+ _ZN20RadioStationCarousel4initER13RadioUiLoaderP13RadioUiEngine @ 119 NONAME
+ _ZN20RadioStationCarousel4skipEN11StationSkip4ModeE @ 120 NONAME
+ _ZN20RadioStationCarousel6updateERK12RadioStation @ 121 NONAME
+ _ZN20RadioStationCarousel8uiEngineEv @ 122 NONAME
+ _ZN20RadioStationCarousel9adjustPosEi @ 123 NONAME
+ _ZN20RadioStationCarousel9nextIndexEi @ 124 NONAME
+ _ZN20RadioStationCarousel9prevIndexEi @ 125 NONAME
+ _ZN20RadioStationCarousel9showEventEP10QShowEvent @ 126 NONAME
+ _ZN20RadioStationCarousel9trimIndexEi @ 127 NONAME
+ _ZN20RadioStationCarouselC1EP13QGraphicsItem @ 128 NONAME
+ _ZN20RadioStationCarouselC2EP13QGraphicsItem @ 129 NONAME
+ _ZNK11RadioWindow10metaObjectEv @ 130 NONAME
+ _ZNK16RadioFadingLabel10metaObjectEv @ 131 NONAME
+ _ZNK19RadioFrequencyStrip10itemHeightEv @ 132 NONAME
+ _ZNK19RadioFrequencyStrip10metaObjectEv @ 133 NONAME
+ _ZNK19RadioFrequencyStrip11selectorPosEv @ 134 NONAME
+ _ZNK19RadioFrequencyStrip18isInManualSeekModeEv @ 135 NONAME
+ _ZNK19RadioFrequencyStrip9frequencyEv @ 136 NONAME
+ _ZNK20RadioStationCarousel10metaObjectEv @ 137 NONAME
+ _ZNK20RadioStationCarousel12favoriteIconEv @ 138 NONAME
+ _ZNK20RadioStationCarousel13isInitializedEv @ 139 NONAME
+ _ZNK20RadioStationCarousel14autoScrollTimeEv @ 140 NONAME
+ _ZNK20RadioStationCarousel14isInManualSeekEv @ 141 NONAME
+ _ZNK20RadioStationCarousel15nonFavoriteIconEv @ 142 NONAME
+ _ZNK20RadioStationCarousel16isInScanningModeEv @ 143 NONAME
+ _ZNK20RadioStationCarousel17isAntennaAttachedEv @ 144 NONAME
+ _ZNK20RadioStationCarousel18isScrollingAllowedEv @ 145 NONAME
+ _ZTI11RadioWindow @ 146 NONAME
+ _ZTI16RadioFadingLabel @ 147 NONAME
+ _ZTI19RadioFrequencyStrip @ 148 NONAME
+ _ZTI20RadioStationCarousel @ 149 NONAME
+ _ZTV11RadioWindow @ 150 NONAME
+ _ZTV16RadioFadingLabel @ 151 NONAME
+ _ZTV19RadioFrequencyStrip @ 152 NONAME
+ _ZTV20RadioStationCarousel @ 153 NONAME
+ _ZThn28_N20RadioStationCarousel11findStationEj @ 154 NONAME
+ _ZThn28_N20RadioStationCarousel13localizeGenreEi @ 155 NONAME
+ _ZThn28_N20RadioStationCarousel16handleUrlClickedERK12RadioStation @ 156 NONAME
+ _ZThn28_N20RadioStationCarousel17handleIconClickedERK12RadioStation @ 157 NONAME
+ _ZThn28_N20RadioStationCarousel22handleRadiotextClickedERK12RadioStation @ 158 NONAME
+ _ZThn28_NK20RadioStationCarousel12favoriteIconEv @ 159 NONAME
+ _ZThn28_NK20RadioStationCarousel14isInManualSeekEv @ 160 NONAME
+ _ZThn28_NK20RadioStationCarousel15nonFavoriteIconEv @ 161 NONAME
+ _ZThn8_N11RadioWindowD0Ev @ 162 NONAME
+ _ZThn8_N11RadioWindowD1Ev @ 163 NONAME
+ _ZThn8_N19RadioFrequencyStrip15mousePressEventEP24QGraphicsSceneMouseEvent @ 164 NONAME
+ _ZThn8_N19RadioFrequencyStrip17mouseReleaseEventEP24QGraphicsSceneMouseEvent @ 165 NONAME
+ _ZThn8_N20RadioStationCarousel15mousePressEventEP24QGraphicsSceneMouseEvent @ 166 NONAME
+ _ZN19RadioFrequencyStrip7makeTabEfi @ 167 NONAME
--- a/radioapp/radioapplication/radioapplication.pro Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radioapplication/radioapplication.pro Fri Jun 25 19:09:05 2010 +0300
@@ -14,19 +14,27 @@
# Description:
#
+TMP_DIR_NAME = app
include(../buildflags.pri)
TEMPLATE = app
TARGET = fmradio
TRANSLATIONS += fmradio.ts
-ICON = resources/qtg_large_radio.svg
-#ICON = qtg_large_radio.svg
symbian: {
TARGET.CAPABILITY = CAP_APPLICATION MultimediaDD
TARGET.UID3 = 0x2002FF4E
TARGET.EPOCSTACKSIZE = 0x14000
TARGET.EPOCHEAPSIZE = 0x020000 0x2400000
+ SKINICON = qtg_large_radio
+ ICON = resources/qtg_large_radio.svg # Fallback icon in case theme doesn't have one
+
+ LIBS += -lxqserviceutil
+
+ BLD_INF_RULES.prj_exports += "resources/fmradio.docml /epoc32/release/winscw/udeb/z/resource/hb/splashml/fmradio.docml" \
+ "resources/fmradio.splashml /epoc32/release/winscw/udeb/z/resource/hb/splashml/fmradio.splashml" \
+ "resources/fmradio.docml /epoc32/data/z/resource/hb/splashml/fmradio.docml" \
+ "resources/fmradio.splashml /epoc32/data/z/resource/hb/splashml/fmradio.splashml"
}
CONFIG += hb service
--- a/radioapp/radioapplication/resources/compile_ts.bat Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radioapplication/resources/compile_ts.bat Fri Jun 25 19:09:05 2010 +0300
@@ -1,3 +1,19 @@
+::
+:: Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+:: All rights reserved.
+:: This component and the accompanying materials are made available
+:: under the terms of "Eclipse Public License v1.0"
+:: which accompanies this distribution, and is available
+:: at the URL "http://www.eclipse.org/legal/epl-v10.html".
+::
+:: Initial Contributors:
+:: Nokia Corporation - initial contribution.
+::
+:: Contributors:
+::
+:: Description:
+::
+
@echo off
set QM_FILE_US=fmradio_en_US.qm
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioapp/radioapplication/resources/fmradio.docml Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<hbdocument version="0.9">
+ <widget name="splashView" type="HbView">
+ <string name="title" locid="txt_rad_title_fm_radio" />
+ </widget>
+</hbdocument>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioapp/radioapplication/resources/fmradio.splashml Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<hbsplash version="1">
+ <docml>fmradio.docml</docml>
+ <widget>splashView</widget>
+ <appuid>0x2002FF4E</appuid>
+ <tsappname>fmradio</tsappname>
+</hbsplash>
--- a/radioapp/radioapplication/resources/fmradio.ts Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radioapplication/resources/fmradio.ts Fri Jun 25 19:09:05 2010 +0300
@@ -17,9 +17,9 @@
<source>Rock Music</source>
<translation variants="no">Rock Music</translation>
<extra-loc-layout_id>txt_rad_info_news</extra-loc-layout_id>
- <extra-loc-viewid>rad_01</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_001</extra-loc-viewid>
<extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_info_personality">
@@ -27,9 +27,9 @@
<source>Personality</source>
<translation variants="no">Personality</translation>
<extra-loc-layout_id>txt_rad_info_news</extra-loc-layout_id>
- <extra-loc-viewid>rad_01</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_001</extra-loc-viewid>
<extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_info_clear_recently_played_songs_list">
@@ -47,39 +47,19 @@
<source>Play history</source>
<translation variants="no">Play history</translation>
<extra-loc-layout_id>qtl_menu_pri</extra-loc-layout_id>
- <extra-loc-viewid>rad_01</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_001</extra-loc-viewid>
<extra-loc-positionid>opt</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_rad_info_recently_played_songs_collects_song2">
- <comment>Info text in main pane area if Recently played songs has no item (e.g. after the user has emptied the list). Note that "Identify song" must be the same string as txt_rad_list_identify_song. "Recently played songs" text must be the same as "Recently played songs" text must be the same as txt_rad_button_recently_played_songs. Displayed if Shazam (song identification) application is NOT installed to the device.</comment>
- <source>Recently played songs collects song information from radio stations which send the song information using RDS+ technology.</source>
- <translation variants="no">Recently played songs collects song information from radio stations which send the song information using RDS+ technology.</translation>
- <extra-loc-layout_id>qtl_view_empty_description_sec</extra-loc-layout_id>
- <extra-loc-viewid>rad_03</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_common_button_cancel">
- <comment>Button. Ignores the dialog and returns previous view</comment>
- <source>Cancel</source>
- <translation variants="no">Cancel</translation>
- <extra-loc-layout_id>qtl_dialog_softkey</extra-loc-layout_id>
- <extra-loc-viewid>common</extra-loc-viewid>
- <extra-loc-positionid>button</extra-loc-positionid>
- <extra-loc-feature>co</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_info_news">
- <comment>Main view Information area item. Displayed if PTY is available. RDS Programme Type identifier for PTY code 1.</comment>
+ <comment>Main view Information area item. Displayed if PTY is available. RDS Programme Type identifier for PTY code 1. Custom layout ID parent.</comment>
<source>News</source>
<translation variants="no">News</translation>
<extra-loc-layout_id>txt_rad_info_news</extra-loc-layout_id>
- <extra-loc-viewid>rad_01</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_001</extra-loc-viewid>
<extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_opt_search_all_stations">
@@ -97,9 +77,9 @@
<source>Culture</source>
<translation variants="no">Culture</translation>
<extra-loc-layout_id>txt_rad_info_news</extra-loc-layout_id>
- <extra-loc-viewid>rad_01</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_001</extra-loc-viewid>
<extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_dblist_l1_mhz_val_soft_rhythm_and_blues">
@@ -107,9 +87,9 @@
<source>Soft rhythm and blues</source>
<translation variants="no">Soft rhythm and blues</translation>
<extra-loc-layout_id>qtl_list_sec_graphic</extra-loc-layout_id>
- <extra-loc-viewid>rad_02</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_002</extra-loc-viewid>
<extra-loc-positionid>dblist_val</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_info_country_music">
@@ -117,9 +97,9 @@
<source>Country Music</source>
<translation variants="no">Country Music</translation>
<extra-loc-layout_id>txt_rad_info_news</extra-loc-layout_id>
- <extra-loc-viewid>rad_01</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_001</extra-loc-viewid>
<extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_fmradio_info_local_frequency_band_automaticall">
@@ -137,9 +117,9 @@
<source>%L1 MHz</source>
<translation variants="no">%L1 MHz</translation>
<extra-loc-layout_id>qtl_list_sec2_graphic</extra-loc-layout_id>
- <extra-loc-viewid>rad_03</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_003</extra-loc-viewid>
<extra-loc-positionid>dblist_val</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_dblist_l1_mhz_val_rock_music">
@@ -147,9 +127,9 @@
<source>Rock Music</source>
<translation variants="no">Rock Music</translation>
<extra-loc-layout_id>qtl_list_sec_graphic</extra-loc-layout_id>
- <extra-loc-viewid>rad_02</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_002</extra-loc-viewid>
<extra-loc-positionid>dblist_val</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_button_tagged_songs">
@@ -157,9 +137,9 @@
<source>Tagged songs</source>
<translation variants="no">Tagged songs</translation>
<extra-loc-layout_id>qtl_toolbar_tiny_2</extra-loc-layout_id>
- <extra-loc-viewid>rad_03</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_003</extra-loc-viewid>
<extra-loc-positionid>button</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_info_soft_rock">
@@ -167,9 +147,9 @@
<source>Soft rock</source>
<translation variants="no">Soft rock</translation>
<extra-loc-layout_id>txt_rad_info_news</extra-loc-layout_id>
- <extra-loc-viewid>rad_01</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_001</extra-loc-viewid>
<extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_dblist_l1_mhz_val_culture">
@@ -177,19 +157,19 @@
<source>Culture</source>
<translation variants="no">Culture</translation>
<extra-loc-layout_id>qtl_list_sec_graphic</extra-loc-layout_id>
- <extra-loc-viewid>rad_02</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_002</extra-loc-viewid>
<extra-loc-positionid>dblist_val</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
-<message numerus="no" id="txt_rad_menu_search_via_shazam">
- <comment>Item specific menu item. Opens a Shazam application where user can search song related services.</comment>
- <source>Search via Shazam</source>
- <translation variants="no">Search via Shazam</translation>
- <extra-loc-layout_id>qtl_menu_sec</extra-loc-layout_id>
- <extra-loc-viewid>rad_03</extra-loc-viewid>
- <extra-loc-positionid>menu</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+<message numerus="no" id="txt_rad_button_add_to_favourites">
+ <comment>A button text in main view. Adds currently active station to Favourite station's list.</comment>
+ <source>Add to favourites</source>
+ <translation variants="no">Add to favourites</translation>
+ <extra-loc-layout_id>txt_rad_button_stations</extra-loc-layout_id>
+ <extra-loc-viewid>FmRadio_001</extra-loc-viewid>
+ <extra-loc-positionid>button</extra-loc-positionid>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_info_nostalgia">
@@ -197,9 +177,9 @@
<source>Nostalgia</source>
<translation variants="no">Nostalgia</translation>
<extra-loc-layout_id>txt_rad_info_news</extra-loc-layout_id>
- <extra-loc-viewid>rad_01</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_001</extra-loc-viewid>
<extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_info_social_affairs">
@@ -207,9 +187,9 @@
<source>Social Affairs</source>
<translation variants="no">Social Affairs</translation>
<extra-loc-layout_id>txt_rad_info_news</extra-loc-layout_id>
- <extra-loc-viewid>rad_01</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_001</extra-loc-viewid>
<extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_opt_clear_list">
@@ -217,9 +197,9 @@
<source>Clear list</source>
<translation variants="no">Clear list</translation>
<extra-loc-layout_id>qtl_menu_pri</extra-loc-layout_id>
- <extra-loc-viewid>rad_03</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_003</extra-loc-viewid>
<extra-loc-positionid>opt</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_dblist_l1_mhz_val_other_music">
@@ -227,9 +207,9 @@
<source>Other Music</source>
<translation variants="no">Other Music</translation>
<extra-loc-layout_id>qtl_list_sec_graphic</extra-loc-layout_id>
- <extra-loc-viewid>rad_02</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_002</extra-loc-viewid>
<extra-loc-positionid>dblist_val</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_info_rhythm_and_blues">
@@ -237,9 +217,9 @@
<source>Rhythm and blues</source>
<translation variants="no">Rhythm and blues</translation>
<extra-loc-layout_id>txt_rad_info_news</extra-loc-layout_id>
- <extra-loc-viewid>rad_01</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_001</extra-loc-viewid>
<extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_dblist_l1_mhz_val_religious_talk">
@@ -247,9 +227,9 @@
<source>Religious talk</source>
<translation variants="no">Religious talk</translation>
<extra-loc-layout_id>qtl_list_sec_graphic</extra-loc-layout_id>
- <extra-loc-viewid>rad_02</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_002</extra-loc-viewid>
<extra-loc-positionid>dblist_val</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_button_activate_loudspeaker">
@@ -257,9 +237,9 @@
<source>Activate loudspeaker</source>
<translation variants="no">Activate loudspeaker</translation>
<extra-loc-layout_id>txt_rad_button_stations</extra-loc-layout_id>
- <extra-loc-viewid>rad_01</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_001</extra-loc-viewid>
<extra-loc-positionid>button</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_dblist_l1_mhz_val_nostalgia">
@@ -267,19 +247,9 @@
<source>Nostalgia</source>
<translation variants="no">Nostalgia</translation>
<extra-loc-layout_id>qtl_list_sec_graphic</extra-loc-layout_id>
- <extra-loc-viewid>rad_02</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_002</extra-loc-viewid>
<extra-loc-positionid>dblist_val</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_common_menu_delete">
- <comment>Item specific menu item. Allows the user to delete a station.</comment>
- <source>Delete</source>
- <translation variants="no">Delete</translation>
- <extra-loc-layout_id>qtl_menu_sec</extra-loc-layout_id>
- <extra-loc-viewid>common</extra-loc-viewid>
- <extra-loc-positionid>menu</extra-loc-positionid>
- <extra-loc-feature>co</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_info_language">
@@ -287,9 +257,9 @@
<source>Language</source>
<translation variants="no">Language</translation>
<extra-loc-layout_id>txt_rad_info_news</extra-loc-layout_id>
- <extra-loc-viewid>rad_01</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_001</extra-loc-viewid>
<extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_info_talk">
@@ -297,19 +267,9 @@
<source>Talk</source>
<translation variants="no">Talk</translation>
<extra-loc-layout_id>txt_rad_info_news</extra-loc-layout_id>
- <extra-loc-viewid>rad_01</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_001</extra-loc-viewid>
<extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_common_menu_rename_item">
- <comment>Item specific menu item. Allows the user to define a new name for a station.</comment>
- <source>Rename</source>
- <translation variants="no">Rename</translation>
- <extra-loc-layout_id>qtl_menu_sec</extra-loc-layout_id>
- <extra-loc-viewid>common</extra-loc-viewid>
- <extra-loc-positionid>menu</extra-loc-positionid>
- <extra-loc-feature>co</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_info_soft_rhythm_and_blues">
@@ -317,9 +277,9 @@
<source>Soft rhythm and blues</source>
<translation variants="no">Soft rhythm and blues</translation>
<extra-loc-layout_id>txt_rad_info_news</extra-loc-layout_id>
- <extra-loc-viewid>rad_01</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_001</extra-loc-viewid>
<extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_dblist_l1_mhz_val_national_music">
@@ -327,9 +287,9 @@
<source>National Music</source>
<translation variants="no">National Music</translation>
<extra-loc-layout_id>qtl_list_sec_graphic</extra-loc-layout_id>
- <extra-loc-viewid>rad_02</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_002</extra-loc-viewid>
<extra-loc-positionid>dblist_val</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_info_science">
@@ -337,9 +297,9 @@
<source>Science</source>
<translation variants="no">Science</translation>
<extra-loc-layout_id>txt_rad_info_news</extra-loc-layout_id>
- <extra-loc-viewid>rad_01</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_001</extra-loc-viewid>
<extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_dblist_l1_mhz_val_weather">
@@ -347,9 +307,9 @@
<source>Weather</source>
<translation variants="no">Weather</translation>
<extra-loc-layout_id>qtl_list_sec_graphic</extra-loc-layout_id>
- <extra-loc-viewid>rad_02</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_002</extra-loc-viewid>
<extra-loc-positionid>dblist_val</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_dblist_l1_mhz_val_drama">
@@ -357,9 +317,9 @@
<source>Drama</source>
<translation variants="no">Drama</translation>
<extra-loc-layout_id>qtl_list_sec_graphic</extra-loc-layout_id>
- <extra-loc-viewid>rad_02</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_002</extra-loc-viewid>
<extra-loc-positionid>dblist_val</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_info_national_music">
@@ -367,9 +327,9 @@
<source>National Music</source>
<translation variants="no">National Music</translation>
<extra-loc-layout_id>txt_rad_info_news</extra-loc-layout_id>
- <extra-loc-viewid>rad_01</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_001</extra-loc-viewid>
<extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_info_religious_music">
@@ -377,9 +337,9 @@
<source>Religious music</source>
<translation variants="no">Religious music</translation>
<extra-loc-layout_id>txt_rad_info_news</extra-loc-layout_id>
- <extra-loc-viewid>rad_01</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_001</extra-loc-viewid>
<extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_dblist_l1_mhz_val_oldies_music">
@@ -387,9 +347,9 @@
<source>Oldies Music</source>
<translation variants="no">Oldies Music</translation>
<extra-loc-layout_id>qtl_list_sec_graphic</extra-loc-layout_id>
- <extra-loc-viewid>rad_02</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_002</extra-loc-viewid>
<extra-loc-positionid>dblist_val</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_info_education">
@@ -397,29 +357,9 @@
<source>Education</source>
<translation variants="no">Education</translation>
<extra-loc-layout_id>txt_rad_info_news</extra-loc-layout_id>
- <extra-loc-viewid>rad_01</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_001</extra-loc-viewid>
<extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_common_button_no">
- <comment>Button. Pressing this button rejects the selected operation.</comment>
- <source>No</source>
- <translation variants="no">No</translation>
- <extra-loc-layout_id>qtl_dialog_softkey</extra-loc-layout_id>
- <extra-loc-viewid>common</extra-loc-viewid>
- <extra-loc-positionid>button</extra-loc-positionid>
- <extra-loc-feature>co</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_common_button_ok">
- <comment>Button. Allows the user to accept the dialog and return to previous view</comment>
- <source>OK</source>
- <translation variants="no">OK</translation>
- <extra-loc-layout_id>qtl_dialog_softkey</extra-loc-layout_id>
- <extra-loc-viewid>common</extra-loc-viewid>
- <extra-loc-positionid>button</extra-loc-positionid>
- <extra-loc-feature>co</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_info_station_list_is_full_please_remove_s">
@@ -434,12 +374,12 @@
</message>
<message numerus="no" id="txt_rad_info_no_favourites_add_favourites_to_see">
<comment>Info text in main pane if "Favourites" list has no items. "Favourite stations" text must be same localization as txt_rad_subhead_favorite_stations. Favourite icon refers to a star -icon in the main view.</comment>
- <source>You can mark your favourite stations in All stations view by long tapping the station and selecting Add favourite. You can also tap the favourite icon in main view to mark it as a favorite.</source>
- <translation variants="no">You can mark your favourite stations in All stations view by long tapping the station and selecting Add favourite. You can also tap the favourite icon in main view to mark it as a favorite.</translation>
+ <source>Tap the star icon or Add to favourite button in main view to mark currently playing station as a favorite.</source>
+ <translation variants="no">Tap the star icon or Add to favourite button in main view to mark currently playing station as a favorite.</translation>
<extra-loc-layout_id>qtl_view_empty_description_sec</extra-loc-layout_id>
- <extra-loc-viewid>rad_02</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_002</extra-loc-viewid>
<extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_info_clear_favourite_stations_list">
@@ -457,9 +397,9 @@
<source>Adult hits</source>
<translation variants="no">Adult hits</translation>
<extra-loc-layout_id>txt_rad_info_news</extra-loc-layout_id>
- <extra-loc-viewid>rad_01</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_001</extra-loc-viewid>
<extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_info_no_favourite_stations">
@@ -467,29 +407,19 @@
<source>(No favourite stations)</source>
<translation variants="no">(No favourite stations)</translation>
<extra-loc-layout_id>qtl_view_empty_title_pri</extra-loc-layout_id>
- <extra-loc-viewid>rad_02</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_002</extra-loc-viewid>
<extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_button_stations">
- <comment>A button text in main view. Opens a Stations list view, which lists All stations and Favourite stations views.</comment>
+ <comment>A button text in main view. Opens a Stations list view, which lists All stations and Favourite stations views. Custom layout ID parent.</comment>
<source>Stations</source>
<translation variants="no">Stations</translation>
<extra-loc-layout_id>txt_rad_button_stations</extra-loc-layout_id>
- <extra-loc-viewid>rad_01</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_001</extra-loc-viewid>
<extra-loc-positionid>button</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_rad_dialog_long_press_arrow_keys_to_search_str">
- <comment>Help text displayed in main view station information area. Displayed if no stations have been marked as favourites and user presses previous or next button.</comment>
- <source>Mark favourite stations by pressing the star icon to enable navigation with short arrow presses. You can also swipe here to navigate between all stations. Long press arrow keys to search strong signal stations. </source>
- <translation variants="no">Mark favourite stations by pressing the star icon to enable navigation with short arrow presses. You can also swipe here to navigate between all stations. Long press arrow keys to search strong signal stations. </translation>
- <extra-loc-layout_id>txt_rad_dialog_long_press_arrow_keys_to_search_str</extra-loc-layout_id>
- <extra-loc-viewid>rad_01</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_info_pop_music">
@@ -497,9 +427,19 @@
<source>Pop Music</source>
<translation variants="no">Pop Music</translation>
<extra-loc-layout_id>txt_rad_info_news</extra-loc-layout_id>
- <extra-loc-viewid>rad_01</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_001</extra-loc-viewid>
<extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_fmradio_button_remove_from_favourites">
+ <comment>A button text in main view. Removes currently active station from Favourite station's list.</comment>
+ <source>Remove from favourites</source>
+ <translation variants="no">Remove from favourites</translation>
+ <extra-loc-layout_id>txt_rad_button_stations</extra-loc-layout_id>
+ <extra-loc-viewid>FmRadio_001</extra-loc-viewid>
+ <extra-loc-positionid>button</extra-loc-positionid>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_info_varied">
@@ -507,9 +447,9 @@
<source>Varied</source>
<translation variants="no">Varied</translation>
<extra-loc-layout_id>txt_rad_info_news</extra-loc-layout_id>
- <extra-loc-viewid>rad_01</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_001</extra-loc-viewid>
<extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_info_alarm">
@@ -517,9 +457,9 @@
<source>Alarm</source>
<translation variants="no">Alarm</translation>
<extra-loc-layout_id>txt_rad_info_news</extra-loc-layout_id>
- <extra-loc-viewid>rad_01</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_001</extra-loc-viewid>
<extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_info_other_music">
@@ -527,9 +467,9 @@
<source>Other Music</source>
<translation variants="no">Other Music</translation>
<extra-loc-layout_id>txt_rad_info_news</extra-loc-layout_id>
- <extra-loc-viewid>rad_01</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_001</extra-loc-viewid>
<extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_long_caption_fm_radio">
@@ -547,9 +487,9 @@
<source>Children’s programmes</source>
<translation variants="no">Children’s programmes</translation>
<extra-loc-layout_id>txt_rad_info_news</extra-loc-layout_id>
- <extra-loc-viewid>rad_01</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_001</extra-loc-viewid>
<extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_dblist_l1_mhz_val_varied">
@@ -557,9 +497,9 @@
<source>Varied</source>
<translation variants="no">Varied</translation>
<extra-loc-layout_id>qtl_list_sec_graphic</extra-loc-layout_id>
- <extra-loc-viewid>rad_02</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_002</extra-loc-viewid>
<extra-loc-positionid>dblist_val</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_info_leisure">
@@ -567,9 +507,9 @@
<source>Leisure</source>
<translation variants="no">Leisure</translation>
<extra-loc-layout_id>txt_rad_info_news</extra-loc-layout_id>
- <extra-loc-viewid>rad_01</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_001</extra-loc-viewid>
<extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_dblist_l1_mhz_val_alarm">
@@ -577,9 +517,9 @@
<source>Alarm</source>
<translation variants="no">Alarm</translation>
<extra-loc-layout_id>qtl_list_sec_graphic</extra-loc-layout_id>
- <extra-loc-viewid>rad_02</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_002</extra-loc-viewid>
<extra-loc-positionid>dblist_val</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_dblist_l1_mhz_val_information">
@@ -587,9 +527,9 @@
<source>Information</source>
<translation variants="no">Information</translation>
<extra-loc-layout_id>qtl_list_sec_graphic</extra-loc-layout_id>
- <extra-loc-viewid>rad_02</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_002</extra-loc-viewid>
<extra-loc-positionid>dblist_val</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_menu_remove_favourite">
@@ -597,21 +537,9 @@
<source>Remove from favourites</source>
<translation variants="no">Remove from favourites</translation>
<extra-loc-layout_id>qtl_menu_sec</extra-loc-layout_id>
- <extra-loc-viewid>rad_02</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_002</extra-loc-viewid>
<extra-loc-positionid>menu</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_rad_info_recently_played_songs_collects_song_i">
- <comment>Info text in main pane area if Recently played songs list has no item (e.g. after the user has emptied the list). Note that "Identify song" must be the same string as txt_rad_list_identify_song. "Recently played songs" text must be the same as txt_rad_button_recently_played_songs. Displayed if Shazam (song identification) application is installed to the device.</comment>
- <source>Recently played songs collects song information from radio stations which send the song information using RDS+ technology.
-Also songs which are identified with â€Identify song†functionality in main view are displayed here.</source>
- <translation variants="no">Recently played songs collects song information from radio stations which send the song information using RDS+ technology.
-Also songs which are identified with â€Identify song†functionality in main view are displayed here.</translation>
- <extra-loc-layout_id>qtl_view_empty_description_sec</extra-loc-layout_id>
- <extra-loc-viewid>rad_03</extra-loc-viewid>
- <extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_title_fm_radio">
@@ -629,9 +557,9 @@
<source>Cancel</source>
<translation variants="no">Cancel</translation>
<extra-loc-layout_id>txt_rad_button_cancel</extra-loc-layout_id>
- <extra-loc-viewid>rad_01</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_001</extra-loc-viewid>
<extra-loc-positionid>button</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_info_delete_station">
@@ -649,9 +577,9 @@
<source>Religion</source>
<translation variants="no">Religion</translation>
<extra-loc-layout_id>qtl_list_sec_graphic</extra-loc-layout_id>
- <extra-loc-viewid>rad_02</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_002</extra-loc-viewid>
<extra-loc-positionid>dblist_val</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_menu_add_to_favourites">
@@ -659,9 +587,9 @@
<source>Add to favourites</source>
<translation variants="no">Add to favourites</translation>
<extra-loc-layout_id>qtl_menu_sec</extra-loc-layout_id>
- <extra-loc-viewid>rad_02</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_002</extra-loc-viewid>
<extra-loc-positionid>menu</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_info_current_affairs">
@@ -669,19 +597,19 @@
<source>Current affairs</source>
<translation variants="no">Current affairs</translation>
<extra-loc-layout_id>txt_rad_info_news</extra-loc-layout_id>
- <extra-loc-viewid>rad_01</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_001</extra-loc-viewid>
<extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_info_you_can_add_song_to_the_tagged_songs">
<comment>Info text in main pane area if Tagged songs list has no item (e.g. after the user has deleted all content from the list). Note that "tagged songs" must use the same localisation as txt_rad_button_tagged_songs. Recently played songs must be same as "Recently played songs" text must be the same as txt_rad_button_recently_played_songs..</comment>
- <source>You can add song to the tagged songs list from Recently played songs or from main view if song is identified by FM Radio. </source>
- <translation variants="no">You can add song to the tagged songs list from Recently played songs or from main view if song is identified by FM Radio. </translation>
+ <source>You can add song to the tagged songs list from Recently played songs or from main view if song information is available. </source>
+ <translation variants="no">You can add song to the tagged songs list from Recently played songs or from main view if song information is available. </translation>
<extra-loc-layout_id>qtl_view_empty_description_sec</extra-loc-layout_id>
- <extra-loc-viewid>rad_03</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_003</extra-loc-viewid>
<extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_dblist_l1_mhz_val_social_affairs">
@@ -689,9 +617,9 @@
<source>Social Affairs</source>
<translation variants="no">Social Affairs</translation>
<extra-loc-layout_id>qtl_list_sec_graphic</extra-loc-layout_id>
- <extra-loc-viewid>rad_02</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_002</extra-loc-viewid>
<extra-loc-positionid>dblist_val</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_dblist_l1_mhz_val_education">
@@ -699,9 +627,9 @@
<source>Education</source>
<translation variants="no">Education</translation>
<extra-loc-layout_id>qtl_list_sec_graphic</extra-loc-layout_id>
- <extra-loc-viewid>rad_02</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_002</extra-loc-viewid>
<extra-loc-positionid>dblist_val</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_dblist_l1_mhz_val_jazz_music">
@@ -709,9 +637,9 @@
<source>Jazz Music</source>
<translation variants="no">Jazz Music</translation>
<extra-loc-layout_id>qtl_list_sec_graphic</extra-loc-layout_id>
- <extra-loc-viewid>rad_02</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_002</extra-loc-viewid>
<extra-loc-positionid>dblist_val</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_dblist_l1_mhz_val_religious_music">
@@ -719,9 +647,9 @@
<source>Religious music</source>
<translation variants="no">Religious music</translation>
<extra-loc-layout_id>qtl_list_sec_graphic</extra-loc-layout_id>
- <extra-loc-viewid>rad_02</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_002</extra-loc-viewid>
<extra-loc-positionid>dblist_val</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_info_continue_using_the_radio_in_offline">
@@ -739,9 +667,9 @@
<source>(Unknown) - %1</source>
<translation variants="no">(Unknown) - %1</translation>
<extra-loc-layout_id>qtl_list_pri_large_graphic</extra-loc-layout_id>
- <extra-loc-viewid>rad_03</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_003</extra-loc-viewid>
<extra-loc-positionid>dblist</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_dblist_l1_mhz_val_travel">
@@ -749,9 +677,19 @@
<source>Travel</source>
<translation variants="no">Travel</translation>
<extra-loc-layout_id>qtl_list_sec_graphic</extra-loc-layout_id>
- <extra-loc-viewid>rad_02</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_002</extra-loc-viewid>
<extra-loc-positionid>dblist_val</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_song_information_is_collected_automat">
+ <comment>Info text in main pane area if Recently played songs has no item (e.g. after the user has emptied the list). Note that "Identify song" must be the same string as txt_rad_list_identify_song. "Recently played songs" text must be the same as "Recently played songs" text must be the same as txt_rad_button_recently_played_songs. Displayed if Shazam (song identification) application is NOT installed to the device.</comment>
+ <source>Song information is collected automatically from radio stations which send the song information using the RDS+ technology.</source>
+ <translation variants="no">Song information is collected automatically from radio stations which send the song information using the RDS+ technology.</translation>
+ <extra-loc-layout_id>qtl_view_empty_description_sec</extra-loc-layout_id>
+ <extra-loc-viewid>FmRadio_003</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_info_clear_all_stations_list">
@@ -769,9 +707,9 @@
<source>Classical</source>
<translation variants="no">Classical</translation>
<extra-loc-layout_id>qtl_list_sec_graphic</extra-loc-layout_id>
- <extra-loc-viewid>rad_02</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_002</extra-loc-viewid>
<extra-loc-positionid>dblist_val</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_dpophead_song_was_added_to_favorite_songs">
@@ -789,19 +727,9 @@
<source>Talk</source>
<translation variants="no">Talk</translation>
<extra-loc-layout_id>qtl_list_sec_graphic</extra-loc-layout_id>
- <extra-loc-viewid>rad_02</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_002</extra-loc-viewid>
<extra-loc-positionid>dblist_val</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_common_button_yes">
- <comment>Button. Pressing this button confirms the selected operation.</comment>
- <source>Yes</source>
- <translation variants="no">Yes</translation>
- <extra-loc-layout_id>qtl_dialog_softkey</extra-loc-layout_id>
- <extra-loc-viewid>common</extra-loc-viewid>
- <extra-loc-positionid>button</extra-loc-positionid>
- <extra-loc-feature>co</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_dblist_l1_mhz_val_finance">
@@ -809,9 +737,9 @@
<source>Finance</source>
<translation variants="no">Finance</translation>
<extra-loc-layout_id>qtl_list_sec_graphic</extra-loc-layout_id>
- <extra-loc-viewid>rad_02</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_002</extra-loc-viewid>
<extra-loc-positionid>dblist_val</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_info_activate_radio_in_offline_mode">
@@ -829,9 +757,9 @@
<source>Searching local stations. Please wait.</source>
<translation variants="no">Searching local stations. Please wait.</translation>
<extra-loc-layout_id>qtl_dialog_pri3</extra-loc-layout_id>
- <extra-loc-viewid>rad_04</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_004</extra-loc-viewid>
<extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_dblist_l1_mhz2">
@@ -839,9 +767,9 @@
<source>%L1 MHz</source>
<translation variants="no">%L1 MHz</translation>
<extra-loc-layout_id>qtl_list_sec_graphic</extra-loc-layout_id>
- <extra-loc-viewid>rad_02</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_002</extra-loc-viewid>
<extra-loc-positionid>dblist_val</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_info_drama">
@@ -849,19 +777,9 @@
<source>Drama</source>
<translation variants="no">Drama</translation>
<extra-loc-layout_id>txt_rad_info_news</extra-loc-layout_id>
- <extra-loc-viewid>rad_01</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_001</extra-loc-viewid>
<extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_common_opt_deactivate_loudspeaker">
- <comment>Options list item. Deactivates the loudspeaker. Only available if audio can be routed to the headset</comment>
- <source>Deactivate loudspeaker</source>
- <translation variants="no">Deactivate loudspeaker</translation>
- <extra-loc-layout_id>qtl_menu_pri</extra-loc-layout_id>
- <extra-loc-viewid>common</extra-loc-viewid>
- <extra-loc-positionid>opt</extra-loc-positionid>
- <extra-loc-feature>co</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_info_clear_tagged_songs_list">
@@ -879,19 +797,19 @@
<source>Top 40</source>
<translation variants="no">Top 40</translation>
<extra-loc-layout_id>qtl_list_sec_graphic</extra-loc-layout_id>
- <extra-loc-viewid>rad_02</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_002</extra-loc-viewid>
<extra-loc-positionid>dblist_val</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_list_searching_all_available_stations_ple">
<comment>Main pane Information area item. Displayed below the tuning animation during the first time startup.</comment>
<source>Searching all available stations. Please wait.</source>
<translation variants="no">Searching all available stations. Please wait.</translation>
- <extra-loc-layout_id>txt_rad_info_connect_wired_headset</extra-loc-layout_id>
- <extra-loc-viewid>rad_01</extra-loc-viewid>
+ <extra-loc-layout_id>txt_rad_list_searching_all_available_stations_ple</extra-loc-layout_id>
+ <extra-loc-viewid>FmRadio_001</extra-loc-viewid>
<extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_dblist_l1_mhz_val_college">
@@ -899,9 +817,9 @@
<source>College</source>
<translation variants="no">College</translation>
<extra-loc-layout_id>qtl_list_sec_graphic</extra-loc-layout_id>
- <extra-loc-viewid>rad_02</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_002</extra-loc-viewid>
<extra-loc-positionid>dblist_val</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_info_all_stations_in_stations_list_will_be">
@@ -929,9 +847,9 @@
<source>Search stations automatically by tapping here.</source>
<translation variants="no">Search stations automatically by tapping here.</translation>
<extra-loc-layout_id>qtl_view_empty_description_sec</extra-loc-layout_id>
- <extra-loc-viewid>rad_02</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_002</extra-loc-viewid>
<extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_info_college">
@@ -939,9 +857,9 @@
<source>College</source>
<translation variants="no">College</translation>
<extra-loc-layout_id>txt_rad_info_news</extra-loc-layout_id>
- <extra-loc-viewid>rad_01</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_001</extra-loc-viewid>
<extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_dblist_l1_mhz_val_pop_music">
@@ -949,9 +867,9 @@
<source>Pop Music</source>
<translation variants="no">Pop Music</translation>
<extra-loc-layout_id>qtl_list_sec_graphic</extra-loc-layout_id>
- <extra-loc-viewid>rad_02</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_002</extra-loc-viewid>
<extra-loc-positionid>dblist_val</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_dblist_l1_mhz_val_public">
@@ -959,9 +877,9 @@
<source>Public</source>
<translation variants="no">Public</translation>
<extra-loc-layout_id>qtl_list_sec_graphic</extra-loc-layout_id>
- <extra-loc-viewid>rad_02</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_002</extra-loc-viewid>
<extra-loc-positionid>dblist_val</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_fmradio_info_fm_radio_could_not_be_started">
@@ -979,19 +897,9 @@
<source>(No stations)</source>
<translation variants="no">(No stations)</translation>
<extra-loc-layout_id>qtl_view_empty_title_pri</extra-loc-layout_id>
- <extra-loc-viewid>rad_02</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_002</extra-loc-viewid>
<extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_fmradio_list_quick_access_for_fm_radio_in_your">
- <comment>FM radio home screen widget description in application library</comment>
- <source>Quick access for FM radio in your homescreen.</source>
- <translation variants="no">Quick access for FM radio in your homescreen.</translation>
- <extra-loc-layout_id>qtl_list_sec_large_graphic</extra-loc-layout_id>
- <extra-loc-viewid>fmradio</extra-loc-viewid>
- <extra-loc-positionid>list</extra-loc-positionid>
- <extra-loc-feature>fm</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_short_caption_fm_radio">
@@ -1004,24 +912,14 @@
<extra-loc-feature>fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
-<message numerus="no" id="txt_common_opt_exit">
- <comment>Options list item. With the exit option, the user can close the currently active application and return to the Home screen.</comment>
- <source>Exit</source>
- <translation variants="no">Exit</translation>
- <extra-loc-layout_id>qtl_menu_pri</extra-loc-layout_id>
- <extra-loc-viewid>common</extra-loc-viewid>
- <extra-loc-positionid>opt</extra-loc-positionid>
- <extra-loc-feature>co</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
<message numerus="no" id="txt_rad_info_serious_classical">
<comment>Main view Information area item. Displayed if PTY is available. RDS Programme Type identifier for PTY code 14.</comment>
<source>Serious classical</source>
<translation variants="no">Serious classical</translation>
<extra-loc-layout_id>txt_rad_info_news</extra-loc-layout_id>
- <extra-loc-viewid>rad_01</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_001</extra-loc-viewid>
<extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_info_religion">
@@ -1029,9 +927,9 @@
<source>Religion</source>
<translation variants="no">Religion</translation>
<extra-loc-layout_id>txt_rad_info_news</extra-loc-layout_id>
- <extra-loc-viewid>rad_01</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_001</extra-loc-viewid>
<extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_info_easy_listening">
@@ -1039,9 +937,9 @@
<source>Easy Listening</source>
<translation variants="no">Easy Listening</translation>
<extra-loc-layout_id>txt_rad_info_news</extra-loc-layout_id>
- <extra-loc-viewid>rad_01</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_001</extra-loc-viewid>
<extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_info_classical">
@@ -1049,9 +947,9 @@
<source>Classical</source>
<translation variants="no">Classical</translation>
<extra-loc-layout_id>txt_rad_info_news</extra-loc-layout_id>
- <extra-loc-viewid>rad_01</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_001</extra-loc-viewid>
<extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_dpophead_no_stations_found_try_searching">
@@ -1069,9 +967,19 @@
<source>Sport</source>
<translation variants="no">Sport</translation>
<extra-loc-layout_id>qtl_list_sec_graphic</extra-loc-layout_id>
- <extra-loc-viewid>rad_02</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_002</extra-loc-viewid>
<extra-loc-positionid>dblist_val</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_tsw_caption_fm_radio">
+ <comment>Application name in Task switcher.</comment>
+ <source>FM Radio</source>
+ <translation variants="no">FM Radio</translation>
+ <extra-loc-layout_id>qtl_grid_taskswitcher_tiny</extra-loc-layout_id>
+ <extra-loc-viewid>tsw_01</extra-loc-viewid>
+ <extra-loc-positionid>caption</extra-loc-positionid>
+ <extra-loc-feature>ts</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_subhead_play_history">
@@ -1079,9 +987,9 @@
<source>Play history</source>
<translation variants="no">Play history</translation>
<extra-loc-layout_id>qtl_groupbox_simple_sec</extra-loc-layout_id>
- <extra-loc-viewid>rad_03</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_003</extra-loc-viewid>
<extra-loc-positionid>subhead</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_menu_remove_tag">
@@ -1089,9 +997,9 @@
<source>Remove tag</source>
<translation variants="no">Remove tag</translation>
<extra-loc-layout_id>qtl_menu_sec</extra-loc-layout_id>
- <extra-loc-viewid>rad_03</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_003</extra-loc-viewid>
<extra-loc-positionid>menu</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_dblist_l1_mhz_val_personality">
@@ -1099,9 +1007,9 @@
<source>Personality</source>
<translation variants="no">Personality</translation>
<extra-loc-layout_id>qtl_list_sec_graphic</extra-loc-layout_id>
- <extra-loc-viewid>rad_02</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_002</extra-loc-viewid>
<extra-loc-positionid>dblist_val</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_dblist_l1_mhz_val_language">
@@ -1109,9 +1017,9 @@
<source>Language</source>
<translation variants="no">Language</translation>
<extra-loc-layout_id>qtl_list_sec_graphic</extra-loc-layout_id>
- <extra-loc-viewid>rad_02</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_002</extra-loc-viewid>
<extra-loc-positionid>dblist_val</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_dblist_l1_mhz_val_current_affairs">
@@ -1119,9 +1027,9 @@
<source>Current affairs</source>
<translation variants="no">Current affairs</translation>
<extra-loc-layout_id>qtl_list_sec_graphic</extra-loc-layout_id>
- <extra-loc-viewid>rad_02</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_002</extra-loc-viewid>
<extra-loc-positionid>dblist_val</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_info_soft">
@@ -1129,9 +1037,9 @@
<source>Soft</source>
<translation variants="no">Soft</translation>
<extra-loc-layout_id>txt_rad_info_news</extra-loc-layout_id>
- <extra-loc-viewid>rad_01</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_001</extra-loc-viewid>
<extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_button_local_stations">
@@ -1139,9 +1047,9 @@
<source>All stations</source>
<translation variants="no">All stations</translation>
<extra-loc-layout_id>qtl_toolbar_tiny_2</extra-loc-layout_id>
- <extra-loc-viewid>rad_02</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_002</extra-loc-viewid>
<extra-loc-positionid>button</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_dblist_l1_mhz_val_serious_classical">
@@ -1149,9 +1057,9 @@
<source>Serious classical</source>
<translation variants="no">Serious classical</translation>
<extra-loc-layout_id>qtl_list_sec_graphic</extra-loc-layout_id>
- <extra-loc-viewid>rad_02</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_002</extra-loc-viewid>
<extra-loc-positionid>dblist_val</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_info_sport">
@@ -1159,9 +1067,9 @@
<source>Sport</source>
<translation variants="no">Sport</translation>
<extra-loc-layout_id>txt_rad_info_news</extra-loc-layout_id>
- <extra-loc-viewid>rad_01</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_001</extra-loc-viewid>
<extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_info_weather">
@@ -1169,9 +1077,9 @@
<source>Weather</source>
<translation variants="no">Weather</translation>
<extra-loc-layout_id>txt_rad_info_news</extra-loc-layout_id>
- <extra-loc-viewid>rad_01</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_001</extra-loc-viewid>
<extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_dblist_l1_mhz_val_science">
@@ -1179,9 +1087,9 @@
<source>Science</source>
<translation variants="no">Science</translation>
<extra-loc-layout_id>qtl_list_sec_graphic</extra-loc-layout_id>
- <extra-loc-viewid>rad_02</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_002</extra-loc-viewid>
<extra-loc-positionid>dblist_val</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_dblist_l1_mhz_val_classic_rock">
@@ -1189,9 +1097,9 @@
<source>Classic rock</source>
<translation variants="no">Classic rock</translation>
<extra-loc-layout_id>qtl_list_sec_graphic</extra-loc-layout_id>
- <extra-loc-viewid>rad_02</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_002</extra-loc-viewid>
<extra-loc-positionid>dblist_val</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_dblist_l1_mhz_val_soft_rock">
@@ -1199,9 +1107,9 @@
<source>Soft rock</source>
<translation variants="no">Soft rock</translation>
<extra-loc-layout_id>qtl_list_sec_graphic</extra-loc-layout_id>
- <extra-loc-viewid>rad_02</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_002</extra-loc-viewid>
<extra-loc-positionid>dblist_val</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_info_light_classical">
@@ -1209,9 +1117,9 @@
<source>Light classical</source>
<translation variants="no">Light classical</translation>
<extra-loc-layout_id>txt_rad_info_news</extra-loc-layout_id>
- <extra-loc-viewid>rad_01</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_001</extra-loc-viewid>
<extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_dblist_l1_mhz_val_folk_music">
@@ -1219,9 +1127,9 @@
<source>Folk Music</source>
<translation variants="no">Folk Music</translation>
<extra-loc-layout_id>qtl_list_sec_graphic</extra-loc-layout_id>
- <extra-loc-viewid>rad_02</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_002</extra-loc-viewid>
<extra-loc-positionid>dblist_val</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_info_phone_in">
@@ -1229,9 +1137,9 @@
<source>Phone In</source>
<translation variants="no">Phone In</translation>
<extra-loc-layout_id>txt_rad_info_news</extra-loc-layout_id>
- <extra-loc-viewid>rad_01</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_001</extra-loc-viewid>
<extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_button_favourites">
@@ -1239,9 +1147,9 @@
<source>Favourite stations</source>
<translation variants="no">Favourite stations</translation>
<extra-loc-layout_id>qtl_toolbar_tiny_2</extra-loc-layout_id>
- <extra-loc-viewid>rad_02</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_002</extra-loc-viewid>
<extra-loc-positionid>button</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_dblist_1_2">
@@ -1249,9 +1157,9 @@
<source>%1 - %2</source>
<translation variants="no">%1 - %2</translation>
<extra-loc-layout_id>qtl_list_pri2_graphic_add</extra-loc-layout_id>
- <extra-loc-viewid>rad_03</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_003</extra-loc-viewid>
<extra-loc-positionid>dblist</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_dblist_l1_mhz_val_leisure">
@@ -1259,9 +1167,9 @@
<source>Leisure</source>
<translation variants="no">Leisure</translation>
<extra-loc-layout_id>qtl_list_sec_graphic</extra-loc-layout_id>
- <extra-loc-viewid>rad_02</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_002</extra-loc-viewid>
<extra-loc-positionid>dblist_val</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_info_alarm_test">
@@ -1269,9 +1177,9 @@
<source>Alarm Test</source>
<translation variants="no">Alarm Test</translation>
<extra-loc-layout_id>txt_rad_info_news</extra-loc-layout_id>
- <extra-loc-viewid>rad_01</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_001</extra-loc-viewid>
<extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_button_recently_played_songs">
@@ -1279,9 +1187,9 @@
<source>Recently played songs</source>
<translation variants="no">Recently played songs</translation>
<extra-loc-layout_id>qtl_toolbar_tiny_2</extra-loc-layout_id>
- <extra-loc-viewid>rad_03</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_003</extra-loc-viewid>
<extra-loc-positionid>button</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_info_jazz_music">
@@ -1289,9 +1197,9 @@
<source>Jazz Music</source>
<translation variants="no">Jazz Music</translation>
<extra-loc-layout_id>txt_rad_info_news</extra-loc-layout_id>
- <extra-loc-viewid>rad_01</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_001</extra-loc-viewid>
<extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_dblist_l1_mhz_val_soft">
@@ -1299,9 +1207,9 @@
<source>Soft</source>
<translation variants="no">Soft</translation>
<extra-loc-layout_id>qtl_list_sec_graphic</extra-loc-layout_id>
- <extra-loc-viewid>rad_02</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_002</extra-loc-viewid>
<extra-loc-positionid>dblist_val</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_info_information">
@@ -1309,9 +1217,9 @@
<source>Information</source>
<translation variants="no">Information</translation>
<extra-loc-layout_id>txt_rad_info_news</extra-loc-layout_id>
- <extra-loc-viewid>rad_01</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_001</extra-loc-viewid>
<extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_dblist_l1_mhz_val_alarm_test">
@@ -1319,9 +1227,9 @@
<source>Alarm Test</source>
<translation variants="no">Alarm Test</translation>
<extra-loc-layout_id>qtl_list_sec_graphic</extra-loc-layout_id>
- <extra-loc-viewid>rad_02</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_002</extra-loc-viewid>
<extra-loc-positionid>dblist_val</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_dblist_l1_mhz_val_rhythm_and_blues">
@@ -1329,19 +1237,19 @@
<source>Rhythm and blues</source>
<translation variants="no">Rhythm and blues</translation>
<extra-loc-layout_id>qtl_list_sec_graphic</extra-loc-layout_id>
- <extra-loc-viewid>rad_02</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_002</extra-loc-viewid>
<extra-loc-positionid>dblist_val</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_subhead_favorite_stations">
- <comment>Heading text for the Stations view's Favorite stations view</comment>
+ <comment>Heading text for the Stations view's "Favorite stations" view</comment>
<source>Favorite stations</source>
<translation variants="no">Favorite stations</translation>
<extra-loc-layout_id>qtl_groupbox_simple_sec</extra-loc-layout_id>
- <extra-loc-viewid>rad_02</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_002</extra-loc-viewid>
<extra-loc-positionid>subhead</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_dblist_unknown">
@@ -1349,19 +1257,9 @@
<source>(Unknown)</source>
<translation variants="no">(Unknown)</translation>
<extra-loc-layout_id>qtl_list_pri_large_graphic</extra-loc-layout_id>
- <extra-loc-viewid>rad_03</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_003</extra-loc-viewid>
<extra-loc-positionid>dblist</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_common_menu_play_music">
- <comment>Item specific menu item. Starts to play the station when selected. Not displayed if station is already playing.</comment>
- <source>Play</source>
- <translation variants="no">Play</translation>
- <extra-loc-layout_id>qtl_menu_sec</extra-loc-layout_id>
- <extra-loc-viewid>common</extra-loc-viewid>
- <extra-loc-positionid>menu</extra-loc-positionid>
- <extra-loc-feature>co</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_dblist_l1_mhz_val_adult_hits">
@@ -1369,9 +1267,9 @@
<source>Adult hits</source>
<translation variants="no">Adult hits</translation>
<extra-loc-layout_id>qtl_list_sec_graphic</extra-loc-layout_id>
- <extra-loc-viewid>rad_02</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_002</extra-loc-viewid>
<extra-loc-positionid>dblist_val</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_info_play_history_is_empty">
@@ -1379,9 +1277,9 @@
<source>(No songs)</source>
<translation variants="no">(No songs)</translation>
<extra-loc-layout_id>qtl_view_empty_title_pri</extra-loc-layout_id>
- <extra-loc-viewid>rad_03</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_003</extra-loc-viewid>
<extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_menu_search_from_music_store">
@@ -1394,44 +1292,24 @@
<extra-loc-feature>ra</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
-<message numerus="no" id="txt_rad_button_identify_song">
- <comment>A button text in main view. Allows the user to identify the currently playing song. Launches Shazam application which does the actual song identification. Displayed if Shazam application is available in the device.</comment>
- <source>Identify song</source>
- <translation variants="no">Identify song</translation>
- <extra-loc-layout_id>txt_rad_button_stations</extra-loc-layout_id>
- <extra-loc-viewid>rad_01</extra-loc-viewid>
- <extra-loc-positionid>button</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
<message numerus="no" id="txt_rad_dblist_l1_mhz_val_documentary">
<comment>Second row on the Stations list item (PTY=Program type information). </comment>
<source>Documentary</source>
<translation variants="no">Documentary</translation>
<extra-loc-layout_id>qtl_list_sec_graphic</extra-loc-layout_id>
- <extra-loc-viewid>rad_02</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_002</extra-loc-viewid>
<extra-loc-positionid>dblist_val</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_list_seeking">
<comment>Main pane Information area item. Displayed on the center of the area when searching for a strong signal station.</comment>
<source>Seeking</source>
<translation variants="no">Seeking</translation>
- <extra-loc-layout_id>txt_rad_info_connect_wired_headset</extra-loc-layout_id>
- <extra-loc-viewid>rad_01</extra-loc-viewid>
+ <extra-loc-layout_id>txt_rad_list_seeking</extra-loc-layout_id>
+ <extra-loc-viewid>FmRadio_001</extra-loc-viewid>
<extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_rad_list_l1_mhz_big">
- <comment>Main pane information area item for the frequency. %L1 is the radio station's frequency. Displayed in big font. Displayed if station name is not available. Note that the "Mhz" text is displayed smaller than the actual frequency.</comment>
- <source>%L1 MHz</source>
- <translation variants="no">%L1 MHz</translation>
- <extra-loc-layout_id>txt_rad_list_l1_mhz_big</extra-loc-layout_id>
- <extra-loc-viewid>rad_01</extra-loc-viewid>
- <extra-loc-positionid>list</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_info_top_40">
@@ -1439,29 +1317,29 @@
<source>Top 40</source>
<translation variants="no">Top 40</translation>
<extra-loc-layout_id>txt_rad_info_news</extra-loc-layout_id>
- <extra-loc-viewid>rad_01</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_001</extra-loc-viewid>
<extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_dblist_l1_mhz_val_news">
- <comment>Second row on the Stations list item (PTY=Program type information). </comment>
+ <comment>Second row on the Stations list item (PTY=Program type information). </comment>
<source>News</source>
<translation variants="no">News</translation>
<extra-loc-layout_id>qtl_list_sec_graphic</extra-loc-layout_id>
- <extra-loc-viewid>rad_02</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_002</extra-loc-viewid>
<extra-loc-positionid>dblist_val</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_info_connect_wired_headset1">
<comment>Main pane Information area item. Displayed if an antenna is not connected and no internal antenna is available. </comment>
<source>Connect wired headset.</source>
<translation variants="no">Connect wired headset.</translation>
- <extra-loc-layout_id>txt_rad_info_connect_wired_headset</extra-loc-layout_id>
- <extra-loc-viewid>rad_01</extra-loc-viewid>
+ <extra-loc-layout_id>txt_rad_info_connect_wired_headset1</extra-loc-layout_id>
+ <extra-loc-viewid>FmRadio_001</extra-loc-viewid>
<extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_dblist_l1_mhz_val_easy_listening">
@@ -1469,9 +1347,9 @@
<source>Easy Listening</source>
<translation variants="no">Easy Listening</translation>
<extra-loc-layout_id>qtl_list_sec_graphic</extra-loc-layout_id>
- <extra-loc-viewid>rad_02</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_002</extra-loc-viewid>
<extra-loc-positionid>dblist_val</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_info_finance">
@@ -1479,9 +1357,9 @@
<source>Finance</source>
<translation variants="no">Finance</translation>
<extra-loc-layout_id>txt_rad_info_news</extra-loc-layout_id>
- <extra-loc-viewid>rad_01</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_001</extra-loc-viewid>
<extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_dblist_l1_mhz_val_childrens_programmes">
@@ -1489,9 +1367,9 @@
<source>Children’s programmes</source>
<translation variants="no">Children’s programmes</translation>
<extra-loc-layout_id>qtl_list_sec_graphic</extra-loc-layout_id>
- <extra-loc-viewid>rad_02</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_002</extra-loc-viewid>
<extra-loc-positionid>dblist_val</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_info_documentary">
@@ -1499,39 +1377,19 @@
<source>Documentary</source>
<translation variants="no">Documentary</translation>
<extra-loc-layout_id>txt_rad_info_news</extra-loc-layout_id>
- <extra-loc-viewid>rad_01</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_001</extra-loc-viewid>
<extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_rad_button_tag_song">
- <comment>A button text in main view. Adds the currently playing song to the Tagged songs list.</comment>
- <source>Tag song</source>
- <translation variants="no">Tag song</translation>
- <extra-loc-layout_id>txt_rad_button_stations</extra-loc-layout_id>
- <extra-loc-viewid>rad_01</extra-loc-viewid>
- <extra-loc-positionid>button</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_fmradio_list_fm_radio_homescreen_widget">
- <comment>FM Radio home screen widget name in application library</comment>
- <source>FM Radio homescreen widget</source>
- <translation variants="no">FM Radio homescreen widget</translation>
- <extra-loc-layout_id>qtl_list_pri_large_graphic</extra-loc-layout_id>
- <extra-loc-viewid>fmradio</extra-loc-viewid>
- <extra-loc-positionid>list</extra-loc-positionid>
- <extra-loc-feature>fm</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_info_fm_radio">
<comment>Text displayed in main view station information area (in place of station name) during the FM radio startup when the station information is waited to be loaded on the screen.</comment>
<source>FM Radio</source>
<translation variants="no">FM Radio</translation>
- <extra-loc-layout_id>txt_rad_info_fm_radio</extra-loc-layout_id>
- <extra-loc-viewid>rad_01</extra-loc-viewid>
+ <extra-loc-layout_id>txt_rad_info_connect_wired_headset1</extra-loc-layout_id>
+ <extra-loc-viewid>FmRadio_001</extra-loc-viewid>
<extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_dblist_l1_mhz_val_light_classical">
@@ -1539,19 +1397,9 @@
<source>Light classical</source>
<translation variants="no">Light classical</translation>
<extra-loc-layout_id>qtl_list_sec_graphic</extra-loc-layout_id>
- <extra-loc-viewid>rad_02</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_002</extra-loc-viewid>
<extra-loc-positionid>dblist_val</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="qtl_grid_taskswitcher_tiny">
- <comment>Application name in Task switcher.</comment>
- <source>FM Radio</source>
- <translation variants="no">FM Radio</translation>
- <extra-loc-layout_id>qtl_grid_taskswitcher_tiny</extra-loc-layout_id>
- <extra-loc-viewid>tsw_01</extra-loc-viewid>
- <extra-loc-positionid>caption</extra-loc-positionid>
- <extra-loc-feature>ts</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_button_deactivate_loudspeaker">
@@ -1559,9 +1407,9 @@
<source>Deactivate loudspeaker</source>
<translation variants="no">Deactivate loudspeaker</translation>
<extra-loc-layout_id>txt_rad_button_stations</extra-loc-layout_id>
- <extra-loc-viewid>rad_01</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_001</extra-loc-viewid>
<extra-loc-positionid>button</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_info_religious_talk">
@@ -1569,19 +1417,9 @@
<source>Religious talk</source>
<translation variants="no">Religious talk</translation>
<extra-loc-layout_id>txt_rad_info_news</extra-loc-layout_id>
- <extra-loc-viewid>rad_01</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_001</extra-loc-viewid>
<extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_rad_button_search_all_stations">
- <comment>A button text in main view. Starts the automatic frequency scanning for seeking all the available local stations</comment>
- <source>Search all stations</source>
- <translation variants="no">Search all stations</translation>
- <extra-loc-layout_id>txt_rad_button_stations</extra-loc-layout_id>
- <extra-loc-viewid>rad_01</extra-loc-viewid>
- <extra-loc-positionid>button</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_info_travel">
@@ -1589,9 +1427,9 @@
<source>Travel</source>
<translation variants="no">Travel</translation>
<extra-loc-layout_id>txt_rad_info_news</extra-loc-layout_id>
- <extra-loc-viewid>rad_01</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_001</extra-loc-viewid>
<extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_dpophead_connect_wired_headset">
@@ -1609,9 +1447,9 @@
<source>Phone In</source>
<translation variants="no">Phone In</translation>
<extra-loc-layout_id>qtl_list_sec_graphic</extra-loc-layout_id>
- <extra-loc-viewid>rad_02</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_002</extra-loc-viewid>
<extra-loc-positionid>dblist_val</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_info_oldies_music">
@@ -1619,9 +1457,9 @@
<source>Oldies Music</source>
<translation variants="no">Oldies Music</translation>
<extra-loc-layout_id>txt_rad_info_news</extra-loc-layout_id>
- <extra-loc-viewid>rad_01</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_001</extra-loc-viewid>
<extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_menu_search_from_other_store">
@@ -1639,9 +1477,9 @@
<source>Public</source>
<translation variants="no">Public</translation>
<extra-loc-layout_id>txt_rad_info_news</extra-loc-layout_id>
- <extra-loc-viewid>rad_01</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_001</extra-loc-viewid>
<extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_dblist_l1_mhz">
@@ -1649,9 +1487,9 @@
<source>%L1 MHz</source>
<translation variants="no">%L1 MHz</translation>
<extra-loc-layout_id>qtl_list_pri_graphic_add</extra-loc-layout_id>
- <extra-loc-viewid>rad_02</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_002</extra-loc-viewid>
<extra-loc-positionid>dblist</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_list_l1_mhz_small">
@@ -1659,9 +1497,9 @@
<source>%L1 MHz</source>
<translation variants="no">%L1 MHz</translation>
<extra-loc-layout_id>txt_rad_list_l1_mhz_small</extra-loc-layout_id>
- <extra-loc-viewid>rad_01</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_001</extra-loc-viewid>
<extra-loc-positionid>list</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_dblist_l1_mhz_val_country_music">
@@ -1669,9 +1507,9 @@
<source>Country Music</source>
<translation variants="no">Country Music</translation>
<extra-loc-layout_id>qtl_list_sec_graphic</extra-loc-layout_id>
- <extra-loc-viewid>rad_02</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_002</extra-loc-viewid>
<extra-loc-positionid>dblist_val</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_info_remove_song_from_tagged_songs">
@@ -1689,29 +1527,19 @@
<source>Classic rock</source>
<translation variants="no">Classic rock</translation>
<extra-loc-layout_id>txt_rad_info_news</extra-loc-layout_id>
- <extra-loc-viewid>rad_01</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_001</extra-loc-viewid>
<extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
- <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_common_opt_activate_loudspeaker">
- <comment>Options list item. Switches the audio from handset or handsfree to loudspeaker. Only available if audio can be routed to the loudspeaker.</comment>
- <source>Activate loudspeaker</source>
- <translation variants="no">Activate loudspeaker</translation>
- <extra-loc-layout_id>qtl_menu_pri</extra-loc-layout_id>
- <extra-loc-viewid>common</extra-loc-viewid>
- <extra-loc-positionid>opt</extra-loc-positionid>
- <extra-loc-feature>co</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_subhead_all_stations">
- <comment>Heading text for the Stations view's Play history view</comment>
+ <comment>Heading text for the Stations view's "All stations" view</comment>
<source>All stations</source>
<translation variants="no">All stations</translation>
<extra-loc-layout_id>qtl_groupbox_simple_sec</extra-loc-layout_id>
- <extra-loc-viewid>rad_02</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_002</extra-loc-viewid>
<extra-loc-positionid>subhead</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
<message numerus="no" id="txt_rad_info_folk_music">
@@ -1719,9 +1547,9 @@
<source>Folk Music</source>
<translation variants="no">Folk Music</translation>
<extra-loc-layout_id>txt_rad_info_news</extra-loc-layout_id>
- <extra-loc-viewid>rad_01</extra-loc-viewid>
+ <extra-loc-viewid>FmRadio_001</extra-loc-viewid>
<extra-loc-positionid>info</extra-loc-positionid>
- <extra-loc-feature>ra</extra-loc-feature>
+ <extra-loc-feature>Fm</extra-loc-feature>
<extra-loc-blank>False</extra-loc-blank>
</message>
</context>
--- a/radioapp/radioapplication/resources/qtg_large_radio.svg Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radioapplication/resources/qtg_large_radio.svg Fri Jun 25 19:09:05 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="11.647" y2="52.3348">
--- a/radioapp/radioapplication/resources/service_conf.xml Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radioapplication/resources/service_conf.xml Fri Jun 25 19:09:05 2010 +0300
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8" ?>
<service>
- <name>com.nokia.services.Radio</name>
+ <name>fmradio</name>
<filepath>No path</filepath>
<description>Radio services</description>
<interface>
- <name>IRadioControl</name>
+ <name>com.nokia.symbian.IRadioControl</name>
<version>1.0</version>
<description>Interface to control radio playback</description>
</interface>
<interface>
- <name>IRadioMonitor</name>
+ <name>com.nokia.symbian.IRadioMonitor</name>
<version>1.0</version>
<description>Interface to monitor radio status changes</description>
</interface>
--- a/radioapp/radioapplication/src/radioapplication.cpp Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radioapplication/src/radioapplication.cpp Fri Jun 25 19:09:05 2010 +0300
@@ -19,6 +19,8 @@
#include <QTimer>
#include <qsysteminfo.h>
#include <HbDeviceMessageBox>
+#include <xqserviceutil.h>
+#include <HbSplashScreen>
// User includes
#include "radioapplication.h"
@@ -45,7 +47,7 @@
* Constructor
*/
RadioApplication::RadioApplication( int &argc, char *argv[] ) :
- HbApplication( argc, argv )
+ HbApplication( argc, argv, Hb::NoSplash )
{
// Initializes the radio engine utils if UI logs are entered into the engine log
INIT_COMBINED_LOGGER
@@ -53,6 +55,10 @@
LOG_TIMESTAMP( "Start radio" );
setApplicationName( hbTrId( "txt_rad_title_fm_radio" ) );
+ if ( !XQServiceUtil::isService() ) {
+ HbSplashScreen::start();
+ }
+
QTimer::singleShot( 0, this, SLOT(init()) );
}
@@ -67,14 +73,13 @@
}
/*!
- *Private slot
+ * Private slot
*
*/
void RadioApplication::init()
{
// If started as a service, there is no need for offline-check
- const Hb::ActivationReason reason = activateReason();
- bool okToStart = reason == Hb::ActivationReasonService;
+ bool okToStart = XQServiceUtil::isService();
QScopedPointer<QtMobility::QSystemDeviceInfo> deviceInfo( new QtMobility::QSystemDeviceInfo() );
if ( !okToStart ) {
@@ -91,9 +96,10 @@
if ( okToStart ) {
- // MainWindow needs to be alive to be able to show the offline query dialog.
- // The window is only constructed half-way at this point because we may need to shut down if
- // offline usage is not allowed
+ // Try to optimize startup time by launching the radio server process as soon as possible.
+ // This way the server and UI are being initialized at the same time and the startup is faster.
+// RadioUiEngine::launchRadioServer();
+
mMainWindow.reset( new RadioWindow() );
CREATE_WIN32_TEST_WINDOW
--- a/radioapp/radioapplication/src/testwindow_win32.cpp Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radioapplication/src/testwindow_win32.cpp Fri Jun 25 19:09:05 2010 +0300
@@ -37,9 +37,10 @@
#include "radio_global.h"
#include "radioenginewrapper_win32_p.h"
-const int KWindowWidth = 360;
-const int KWindowHeight = 640;
-const int KToolbarHeight = 140;
+const int WINDOW_WIDTH = 360;
+const int WINDOW_HEIGHT = 640;
+const int TOOLBAR_HEIGHT = 120;
+const int WINDOW_EXTRA_WIDTH = 5;
const QString KBtnDisconnectHeadset = "Disconnect Headset";
const QString KBtnConnectHeadset = "Connect Headset";
@@ -223,9 +224,9 @@
void Win32Window::updateWindowSize()
{
if ( mOrientation == Qt::Horizontal ) {
- resize( KWindowHeight, KWindowWidth + KToolbarHeight );
+ resize( WINDOW_HEIGHT + WINDOW_EXTRA_WIDTH, WINDOW_WIDTH + TOOLBAR_HEIGHT );
} else {
- resize( KWindowWidth, KWindowHeight + KToolbarHeight );
+ resize( WINDOW_WIDTH + WINDOW_EXTRA_WIDTH, WINDOW_HEIGHT + TOOLBAR_HEIGHT );
}
}
@@ -267,6 +268,7 @@
*/
void Win32Window::changeTheme( const QString& theme )
{
+ LOG_FORMAT( "Changing to theme %s", GETSTRING( theme ) );
QLocalSocket socket;
socket.connectToServer( "hbthemeserver" );
if ( socket.waitForConnected( 3000 ) ) {
@@ -341,7 +343,11 @@
rootDirs << envDir;
}
- rootDirs << HB_RESOURCES_DIR;
+ QString resourcesDir = HB_RESOURCES_DIR;
+ if ( resourcesDir.isEmpty() ) {
+ resourcesDir = "/hb_dev/src/hbcore/resources";
+ }
+ rootDirs << resourcesDir;
return rootDirs;
}
--- a/radioapp/radioenginewrapper/inc/cradioenginehandler.h Fri Jun 11 13:38:32 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,227 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-#ifndef _CRADIOENGINEHANDLER_H_
-#define _CRADIOENGINEHANDLER_H_
-
-// System includes
-#include <e32base.h>
-
-#include <mw/ProfileEngineSDKCRKeys.h>
-
-// User includes
-#include "radio_global.h"
-#include "mradioengineinitializer.h"
-
-// Forward declarations
-class CRadioEngine;
-class MRadioScanObserver;
-class MRadioRdsDataObserver;
-class CRadioRepositoryManager;
-class MRadioEngineHandlerObserver;
-class MRadioApplicationSettings;
-
-// Class declaration
-class CRadioEngineHandler : public CBase
- , public MRadioEngineInitializer
- {
-public:
-
- CRadioEngineHandler( MRadioEngineHandlerObserver& aObserver );
-
- ~CRadioEngineHandler();
-
- void ConstructL();
-
- /**
- * Sets the rds data observer
- */
- void SetRdsObserver( MRadioRdsDataObserver* aObserver );
-
- /**
- * Starts or stops receiving RDS data
- */
- void SetRdsEnabled( TBool aRdsEnabled );
-
- /**
- * Returns the radio status
- * @return ETrue = radio is on, EFalse = radio is off
- */
- TBool IsRadioOn();
-
- /**
- * Sets the manual seek status
- */
- void SetManualSeekMode( TBool aManualSeek );
-
- /**
- * Returns the manual seek status
- */
- TBool IsInManualSeekMode() const;
-
- /**
- * Tune to the specified frequency
- * @param aFrequency - frequency to lock onto.
- */
- void SetFrequency( TUint aFrequency );
-
- /**
- * Sets the audio mute state
- * @param aMuted - flag to determine whether mute should be turned on or off
- */
- void SetMuted( const TBool aMuted, const TBool aUpdateSettings = ETrue );
-
- /**
- * Gets the audio mute state
- * @return ETrue or EFalse to indicate whether mute is currently on.
- */
- TBool IsMuted() const;
-
- /**
- * Sets the volume level of the FM radio
- * @param aVolume - the volume to be used.
- */
- void SetVolume( TInt aVolume );
-
- /**
- * Gets the volumelevel.
- * @return the current volume
- */
- TInt Volume() const;
-
- /**
- * Gets the max volumelevel.
- * @return the max volume
- */
- TInt MaxVolume() const;
-
- /**
- * Increases the volume by one increment
- */
- void IncreaseVolume();
-
- /**
- * Decreases the volume by one increment
- */
- void DecreaseVolume();
-
- /**
- * Checks if the antenna is attached
- * @return ETrue or EFalse to indicate whether antenna is currently attached.
- */
- TBool IsAntennaAttached() const;
-
- /**
- * Retrieves the current frequency.
- * @return the frequency in hertz
- */
- TUint CurrentFrequency() const;
-
- /**
- * Returns the minimum allowed frequency in the current region
- */
- TUint MinFrequency() const;
-
- /**
- * Returns the maximum allowed frequency in the current region
- */
- TUint MaxFrequency() const;
-
- /**
- * Checks if the given frequency is valid in the current region
- */
- TBool IsFrequencyValid( TUint aFrequency ) const;
-
- /**
- * Scan up to the next available frequency.
- */
- void Seek( Seek::Direction direction );
-
- /**
- * Cancel previously requested scan.
- */
- void CancelSeek();
-
- /**
- * Returns the engine seeking state
- */
- Seek::State SeekingState() const;
-
- /**
- * Rreturn step size for tuning.
- * @return step size
- */
- TUint32 FrequencyStepSize() const;
-
- /**
- * Determine current region
- * @return fmradio region. In case of error, returns EFMRadioRegionNone.
- */
- RadioRegion::Region Region() const;
-
- /**
- * Sets whether or not audio should be routed to loudspeaker
- * @param aLoudspeaker ETrue if loudspeaker should be used, EFalse if not
- */
- void SetAudioRouteToLoudspeaker( TBool aLoudspeaker );
-
- /**
- * Checks if audio is routed to loudspeaker
- * @return ETrue if loudspeaker is used, EFalse if headset is used
- */
- TBool IsAudioRoutedToLoudspeaker() const;
-
- /**
- * Returns a reference to the application settings
- */
- MRadioApplicationSettings& ApplicationSettings() const;
-
-private:
-
-// from base class MRadioEngineInitializer
-
- CRadioAudioRouter* InitAudioRouterL();
- CRadioSystemEventCollector* InitSystemEventCollectorL();
- CRadioSettings* InitSettingsL();
-
-private: // data
-
- /**
- * Radio engine holder
- * Own.
- */
- CRadioEngine* iEngine;
-
- /**
- * Radio handler observer
- * Not own.
- */
- MRadioEngineHandlerObserver& iObserver;
-
- /**
- * Frequency used by delayed tuning
- */
- TUint iFrequency;
-
- /**
- * Selected radio region
- */
- RadioRegion::Region iRegion;
-
- };
-
-#endif //_CRADIOENGINEHANDLER_H_
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioapp/radioenginewrapper/inc/radioenginehandler.h Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,220 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+#ifndef _RADIOENGINEHANDLER_H_
+#define _RADIOENGINEHANDLER_H_
+
+// System includes
+#include <QScopedPointer>
+
+// User includes
+#include "radio_global.h"
+#include "mradioengineinitializer.h"
+
+// Forward declarations
+class CRadioEngine;
+class MRadioRdsDataObserver;
+class MRadioEngineHandlerObserver;
+class MRadioApplicationSettings;
+
+// Class declaration
+class RadioEngineHandler : public MRadioEngineInitializer
+{
+public:
+
+ RadioEngineHandler( MRadioEngineHandlerObserver& observer );
+
+ ~RadioEngineHandler();
+
+ /*!
+ * Attempts to construct the radio engine
+ */
+ bool constructEngine();
+
+ /*!
+ * Sets the rds data observer
+ */
+ void setRdsObserver( MRadioRdsDataObserver* observer );
+
+ /*!
+ * Starts or stops receiving RDS data
+ */
+ void setRdsEnabled( bool rdsEnabled );
+
+ /*!
+ * Returns the radio status
+ * @return ETrue = radio is on, EFalse = radio is off
+ */
+ bool isRadioOn();
+
+ /*!
+ * Sets the manual seek status
+ */
+ void setManualSeekMode( bool manualSeek );
+
+ /*!
+ * Returns the manual seek status
+ */
+ bool isInManualSeekMode() const;
+
+ /*!
+ * Tune to the specified frequency
+ * @param aFrequency - frequency to lock onto.
+ */
+ void setFrequency( uint frequency );
+
+ /*!
+ * Sets the audio mute state
+ * @param aMuted - flag to determine whether mute should be turned on or off
+ */
+ void setMute( const bool muted, const bool updateSettings = true );
+
+ /*!
+ * Gets the audio mute state
+ * @return ETrue or EFalse to indicate whether mute is currently on.
+ */
+ bool isMuted() const;
+
+ /*!
+ * Sets the volume level of the FM radio
+ * @param aVolume - the volume to be used.
+ */
+ void setVolume( int newVolume );
+
+ /*!
+ * Gets the volumelevel.
+ * @return the current volume
+ */
+ int volume() const;
+
+ /*!
+ * Gets the max volumelevel.
+ * @return the max volume
+ */
+ int maxVolume() const;
+
+ /*!
+ * Increases the volume by one increment
+ */
+ void increaseVolume();
+
+ /*!
+ * Decreases the volume by one increment
+ */
+ void decreaseVolume();
+
+ /*!
+ * Checks if the antenna is attached
+ * @return ETrue or EFalse to indicate whether antenna is currently attached.
+ */
+ bool isAntennaAttached() const;
+
+ /*!
+ * Retrieves the current frequency.
+ * @return the frequency in hertz
+ */
+ uint currentFrequency() const;
+
+ /*!
+ * Returns the minimum allowed frequency in the current region
+ */
+ uint minFrequency() const;
+
+ /*!
+ * Returns the maximum allowed frequency in the current region
+ */
+ uint maxFrequency() const;
+
+ /*!
+ * Checks if the given frequency is valid in the current region
+ */
+ bool isFrequencyValid( uint frequency ) const;
+
+ /*!
+ * Scan up to the next available frequency.
+ */
+ void seek( Seek::Direction direction );
+
+ /*!
+ * Cancel previously requested scan.
+ */
+ void cancelSeek();
+
+ /*!
+ * Returns the engine seeking state
+ */
+ Seek::State seekingState() const;
+
+ /*!
+ * Rreturn step size for tuning.
+ * @return step size
+ */
+ uint frequencyStepSize() const;
+
+ /*!
+ * Determine current region
+ * @return fmradio region. In case of error, returns EFMRadioRegionNone.
+ */
+ RadioRegion::Region region() const;
+
+ /*!
+ * Sets whether or not audio should be routed to loudspeaker
+ * @param aLoudspeaker ETrue if loudspeaker should be used, EFalse if not
+ */
+ void setAudioRouteToLoudspeaker( bool loudspeaker );
+
+ /*!
+ * Checks if audio is routed to loudspeaker
+ * @return ETrue if loudspeaker is used, EFalse if headset is used
+ */
+ bool isAudioRoutedToLoudspeaker() const;
+
+ /*!
+ * Returns a reference to the application settings
+ */
+ MRadioApplicationSettings& applicationSettings() const;
+
+private:
+
+// from base class MRadioEngineInitializer
+
+ CRadioAudioRouter* InitAudioRouterL();
+ CRadioSystemEventCollector* InitSystemEventCollectorL();
+ CRadioSettings* InitSettingsL();
+
+private: // data
+
+ /*!
+ * Radio engine holder
+ * Own.
+ */
+ QScopedPointer<CRadioEngine> mEngine;
+
+ /*!
+ * Radio handler observer
+ * Not own.
+ */
+ MRadioEngineHandlerObserver& mObserver;
+
+ /*!
+ * Selected radio region
+ */
+ RadioRegion::Region mRegion;
+
+};
+
+#endif //_RADIOENGINEHANDLER_H_
--- a/radioapp/radioenginewrapper/inc/radioenginewrapper.h Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radioenginewrapper/inc/radioenginewrapper.h Fri Jun 25 19:09:05 2010 +0300
@@ -19,6 +19,7 @@
#define RADIOENGINEWRAPPER_H
// System includes
+#include <QScopedPointer>
// User includes
#include "radiowrapperexport.h"
@@ -33,7 +34,7 @@
// Class declaration
class WRAPPER_DLL_EXPORT RadioEngineWrapper
{
- Q_DECLARE_PRIVATE_D( d_ptr, RadioEngineWrapper )
+ Q_DECLARE_PRIVATE_D( d_ptr.data(), RadioEngineWrapper )
Q_DISABLE_COPY( RadioEngineWrapper )
public:
@@ -99,7 +100,7 @@
/**
* Unmodifiable pointer to the private implementation
*/
- RadioEngineWrapperPrivate* const d_ptr;
+ const QScopedPointer<RadioEngineWrapperPrivate> d_ptr;
};
--- a/radioapp/radioenginewrapper/inc/radioenginewrapper_p.h Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radioenginewrapper/inc/radioenginewrapper_p.h Fri Jun 25 19:09:05 2010 +0300
@@ -28,7 +28,7 @@
#include "mradioenginehandlerobserver.h"
// Forward declarations
-class CRadioEngineHandler;
+class RadioEngineHandler;
class RadioControlEventListener;
class RadioRdsListener;
class RadioSettingsIf;
@@ -74,7 +74,7 @@
* Getter for CRadioEngineHandler instance.
* Returns reference to the CRadioEngineHandler
*/
- CRadioEngineHandler& RadioEnginehandler();
+ RadioEngineHandler& radioEnginehandler();
/**
* Tunes to given frequency
@@ -137,7 +137,7 @@
* Radio engine handler.
* Own.
*/
- QScopedPointer<CRadioEngineHandler> mEngineHandler;
+ QScopedPointer<RadioEngineHandler> mEngineHandler;
/**
* RemCon listener.
--- a/radioapp/radioenginewrapper/inc/radioenginewrapper_win32_p.h Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radioenginewrapper/inc/radioenginewrapper_win32_p.h Fri Jun 25 19:09:05 2010 +0300
@@ -137,12 +137,6 @@
QTimer* mTuneTimer;
- /**
- * Preset scanning handler
- * Own.
- */
-// QScopedPointer<RadioFrequencyScanningHandler> mFrequencyScanningHandler;
-
// QScopedPointer<T_RadioDataParser> mDataParser;
QString mParsingError;
--- a/radioapp/radioenginewrapper/inc/radiosettings.h Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radioenginewrapper/inc/radiosettings.h Fri Jun 25 19:09:05 2010 +0300
@@ -20,6 +20,7 @@
// System includes
#include <QtGlobal>
+#include <QScopedPointer>
// User includes
#include "radiosettingsif.h"
@@ -30,7 +31,7 @@
// Class declaration
class RadioSettings : public RadioSettingsIf
{
- Q_DECLARE_PRIVATE_D( d_ptr, RadioSettings )
+ Q_DECLARE_PRIVATE_D( d_ptr.data(), RadioSettings )
Q_DISABLE_COPY( RadioSettings )
friend class RadioEngineWrapperPrivate;
@@ -56,7 +57,7 @@
/**
* Unmodifiable pointer to the private implementation
*/
- RadioSettingsPrivate* const d_ptr;
+ const QScopedPointer<RadioSettingsPrivate> d_ptr;
};
--- a/radioapp/radioenginewrapper/radioenginewrapper.pro Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radioenginewrapper/radioenginewrapper.pro Fri Jun 25 19:09:05 2010 +0300
@@ -14,6 +14,7 @@
# Description:
#
+TMP_DIR_NAME = enginewrapper
include(../buildflags.pri)
TEMPLATE = lib
@@ -57,7 +58,7 @@
LIBS *= -lfmradioenginesettings
LIBS *= -lfmradioengine
- HEADERS += cradioenginehandler.h
+ HEADERS += radioenginehandler.h
HEADERS += mradioenginehandlerobserver.h
HEADERS += radiocontroleventlistener.h
HEADERS += radiordslistener.h
@@ -67,7 +68,7 @@
SOURCES += radiosettings_p.cpp
SOURCES += radioenginewrapper.cpp
SOURCES += radioenginewrapper_p.cpp
- SOURCES += cradioenginehandler.cpp
+ SOURCES += radioenginehandler.cpp
SOURCES += radiocontroleventlistener.cpp
SOURCES += radiordslistener.cpp
}
--- a/radioapp/radioenginewrapper/src/cradioenginehandler.cpp Fri Jun 11 13:38:32 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,401 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-// User includes
-#include "cradioengine.h"
-#include "cradioaudiorouter.h"
-#include "cradiosystemeventcollector.h"
-#include "cradiosettings.h"
-#include "mradioenginesettings.h"
-#include "cradiorepositorymanager.h"
-#include "mradiordsreceiver.h"
-#include "cradioenginehandler.h"
-#include "mradioenginehandlerobserver.h"
-#include "radio_global.h"
-#include "radiologger.h"
-#include "radioenummapper.h"
-
-/*!
- * Map to translate seek direction enum from its definition in the engine to
- * its definition in the ui and vice versa
- */
-BEGIN_ENUM_MAP( KSeekDirectionMap )
- ENUM_MAP_ITEM( Seek::Down, RadioEngine::ERadioDown ),
- ENUM_MAP_ITEM( Seek::Up, RadioEngine::ERadioUp )
-END_ENUM_MAP( KSeekDirectionMap )
-
-/*!
- * Convenience macro to do the mapping of seek directions
- */
-#define MAP_FROM_UI_DIRECTION(ui_enum) MAP_FROM_UI_ENUM( RadioEngine::TRadioTuneDirection, ui_enum, KSeekDirectionMap )
-
-/*!
- * Map to translate radio region enum from its definition in the engine to
- * its definition in the ui and vice versa
- */
-BEGIN_ENUM_MAP( KRegionMap )
- ENUM_MAP_ITEM( RadioRegion::None, ERadioRegionNone ),
- ENUM_MAP_ITEM( RadioRegion::Default, ERadioRegionDefault ),
- ENUM_MAP_ITEM( RadioRegion::Japan, ERadioRegionJapan ),
- ENUM_MAP_ITEM( RadioRegion::America, ERadioRegionAmerica ),
- ENUM_MAP_ITEM( RadioRegion::Poland, ERadioRegionPoland ),
-END_ENUM_MAP( KRegionMap )
-
-/*!
- * Convenience macros to do the mapping of radio regions
- */
-#define MAP_FROM_UI_REGION(ui_enum) MAP_FROM_UI_ENUM( TRadioRegion, ui_enum, KRegionMap )
-#define MAP_TO_UI_REGION(engine_enum) MAP_TO_UI_ENUM( RadioRegion::Region, engine_enum, KRegionMap )
-
-/*!
- * Map to translate seeking state enum from its definition in the engine to
- * its definition in the ui and vice versa
- */
-BEGIN_ENUM_MAP( KSeekingStateMap )
- ENUM_MAP_ITEM( Seek::NotSeeking, RadioEngine::ERadioNotSeeking ),
- ENUM_MAP_ITEM( Seek::SeekingUp, RadioEngine::ERadioSeekingUp ),
- ENUM_MAP_ITEM( Seek::SeekingDown, RadioEngine::ERadioSeekingDown )
-END_ENUM_MAP( KSeekingStateMap )
-
-/*!
- * Convenience macro to do the mapping of seeking states
- */
-#define MAP_TO_UI_SEEKING_STATE(ui_enum) MAP_TO_UI_ENUM( Seek::State, ui_enum, KSeekingStateMap )
-
-
-// ======== MEMBER FUNCTIONS ========
-
-
-// ---------------------------------------------------------------------------
-//
-// ---------------------------------------------------------------------------
-//
-CRadioEngineHandler::CRadioEngineHandler( MRadioEngineHandlerObserver& aObserver )
- : iObserver( aObserver )
- {
- }
-
-// ---------------------------------------------------------------------------
-//
-// ---------------------------------------------------------------------------
-//
-CRadioEngineHandler::~CRadioEngineHandler()
- {
- delete iEngine;
- }
-
-// ---------------------------------------------------------------------------
-//
-// ---------------------------------------------------------------------------
-//
-void CRadioEngineHandler::ConstructL()
- {
- LOG_METHOD;
-
- iEngine = CRadioEngine::NewL( *this );
-
- iEngine->SystemEventCollector().AddObserverL( &iObserver );
- iEngine->AddObserverL( &iObserver );
-
- iRegion = MAP_TO_UI_REGION( iEngine->Settings().EngineSettings().RegionId() );
- }
-
-// ---------------------------------------------------------------------------
-// Sets the rds data observer
-// ---------------------------------------------------------------------------
-//
-void CRadioEngineHandler::SetRdsObserver( MRadioRdsDataObserver* aObserver )
- {
- TRAP_IGNORE( iEngine->RdsReceiver().AddObserverL( aObserver ) );
- }
-
-// ---------------------------------------------------------------------------
-// Starts or stops receiving RDS data
-// ---------------------------------------------------------------------------
-//
-void CRadioEngineHandler::SetRdsEnabled( TBool aRdsEnabled )
- {
- if ( aRdsEnabled )
- {
- iEngine->RdsReceiver().StartReceiver();
- }
- else
- {
- iEngine->RdsReceiver().StopReceiver();
- }
- }
-
-// ---------------------------------------------------------------------------
-// Returns the radio status.
-// ---------------------------------------------------------------------------
-//
-TBool CRadioEngineHandler::IsRadioOn()
- {
- return iEngine->Settings().EngineSettings().IsPowerOn();
- }
-
-// ---------------------------------------------------------------------------
-// Sets the manual seek status
-// ---------------------------------------------------------------------------
-//
-void CRadioEngineHandler::SetManualSeekMode( TBool aManualSeek )
- {
- iEngine->SetManualSeekMode( aManualSeek );
- }
-
-// ---------------------------------------------------------------------------
-// Returns the manual seek status
-// ---------------------------------------------------------------------------
-//
-TBool CRadioEngineHandler::IsInManualSeekMode() const
- {
- return iEngine->IsInManualSeekMode();
- }
-
-// ---------------------------------------------------------------------------
-// Tune to the specified frequency
-// ---------------------------------------------------------------------------
-//
-void CRadioEngineHandler::SetFrequency( TUint aFrequency )
- {
- iEngine->SetFrequency( aFrequency );
- }
-
-// ---------------------------------------------------------------------------
-// Sets the audio mute state
-// ---------------------------------------------------------------------------
-//
-void CRadioEngineHandler::SetMuted( const TBool aMuted, const TBool aUpdateSettings )
- {
- iEngine->SetVolumeMuted( aMuted, aUpdateSettings );
- }
-
-// ---------------------------------------------------------------------------
-// Gets the audio mute state
-// ---------------------------------------------------------------------------
-//
-TBool CRadioEngineHandler::IsMuted() const
- {
- return iEngine->Settings().EngineSettings().IsVolMuted();
- }
-
-// ---------------------------------------------------------------------------
-// Sets the volume level of the FM radio
-// ---------------------------------------------------------------------------
-//
-void CRadioEngineHandler::SetVolume( TInt aVolume )
- {
- if ( Volume() != aVolume )
- {
- if ( aVolume > 0 )
- {
- iEngine->SetVolumeMuted( EFalse );
- }
-
- iEngine->SetVolume( aVolume );
- }
- }
-
-// ---------------------------------------------------------------------------
-// Gets the volumelevel.
-// ---------------------------------------------------------------------------
-//
-TInt CRadioEngineHandler::Volume() const
- {
- return iEngine->Settings().EngineSettings().Volume();
- }
-
-// ---------------------------------------------------------------------------
-// Gets the max volumelevel.
-// ---------------------------------------------------------------------------
-//
-TInt CRadioEngineHandler::MaxVolume() const
- {
- return iEngine->MaxVolumeLevel();
- }
-
-// ---------------------------------------------------------------------------
-// Increases the volume by one increment
-// ---------------------------------------------------------------------------
-//
-void CRadioEngineHandler::IncreaseVolume()
- {
- iEngine->AdjustVolume( RadioEngine::ERadioIncVolume );
- }
-
-// ---------------------------------------------------------------------------
-// Decreases the volume by one increment
-// ---------------------------------------------------------------------------
-//
-void CRadioEngineHandler::DecreaseVolume()
- {
- iEngine->AdjustVolume( RadioEngine::ERadioDecVolume );
- }
-
-// ---------------------------------------------------------------------------
-// Checks if the antenna is attached
-// ---------------------------------------------------------------------------
-//
-TBool CRadioEngineHandler::IsAntennaAttached() const
- {
- return iEngine->IsAntennaAttached();
- }
-
-// ---------------------------------------------------------------------------
-// Retrieves the current frequency.
-// ---------------------------------------------------------------------------
-//
-TUint CRadioEngineHandler::CurrentFrequency() const
- {
- return iEngine->Settings().EngineSettings().TunedFrequency();
- }
-
-// ---------------------------------------------------------------------------
-// Returns the minimum allowed frequency in the current region
-// ---------------------------------------------------------------------------
-//
-TUint CRadioEngineHandler::MinFrequency() const
- {
- return iEngine->Settings().EngineSettings().MinFrequency();
- }
-
-// ---------------------------------------------------------------------------
-// Returns the maximum allowed frequency in the current region
-// ---------------------------------------------------------------------------
-//
-TUint CRadioEngineHandler::MaxFrequency() const
- {
- return iEngine->Settings().EngineSettings().MaxFrequency();
- }
-
-// ---------------------------------------------------------------------------
-// Checks if the given frequency is valid in the current region
-// ---------------------------------------------------------------------------
-//
-TBool CRadioEngineHandler::IsFrequencyValid( TUint aFrequency ) const
- {
- return iEngine->IsFrequencyValid( aFrequency );
- }
-
-// ---------------------------------------------------------------------------
-// Scan up to the next available frequency
-// ---------------------------------------------------------------------------
-//
-void CRadioEngineHandler::Seek( Seek::Direction direction )
- {
- LOG_TIMESTAMP( "Seek" );
- iEngine->Seek( MAP_FROM_UI_DIRECTION( direction ) );
- }
-
-// ---------------------------------------------------------------------------
-// Cancel previously requested scan, and return to the
-// already tuned frequency
-// ---------------------------------------------------------------------------
-//
-void CRadioEngineHandler::CancelSeek()
- {
- iEngine->CancelSeek();
- }
-
-// ---------------------------------------------------------------------------
-// Returns the engine seeking state
-// ---------------------------------------------------------------------------
-//
-Seek::State CRadioEngineHandler::SeekingState() const
- {
- return MAP_TO_UI_SEEKING_STATE( iEngine->Seeking() );
- }
-
-// ---------------------------------------------------------------------------
-// return step size for tuning.
-// ---------------------------------------------------------------------------
-//
-TUint32 CRadioEngineHandler::FrequencyStepSize() const
- {
- return iEngine->Settings().EngineSettings().FrequencyStepSize();
- }
-
-// ----------------------------------------------------------------------------------------------------
-// Returns the selected radio region
-// ----------------------------------------------------------------------------------------------------
-//
-RadioRegion::Region CRadioEngineHandler::Region() const
- {
- return iRegion;
- }
-
-// ---------------------------------------------------------------------------
-// Sets whether or not audio should be routed to loudspeaker
-// ---------------------------------------------------------------------------
-//
-void CRadioEngineHandler::SetAudioRouteToLoudspeaker( TBool aLoudspeaker )
- {
- TRAPD( err, iEngine->AudioRouter().SetAudioRouteL( aLoudspeaker ? RadioEngine::ERadioSpeaker
- : RadioEngine::ERadioHeadset ) );
- if ( err )
- {
- LOG_FORMAT( "Failed to set audioroute: UseLoudspeadker: %d", aLoudspeaker );
- }
- }
-
-// ---------------------------------------------------------------------------
-// Checks if audio is routed to loudspeaker
-// ---------------------------------------------------------------------------
-//
-TBool CRadioEngineHandler::IsAudioRoutedToLoudspeaker() const
- {
- return iEngine->Settings().EngineSettings().AudioRoute() == RadioEngine::ERadioSpeaker;
- }
-
-// ---------------------------------------------------------------------------
-// Returns the repository manager.
-// ---------------------------------------------------------------------------
-//
-MRadioApplicationSettings& CRadioEngineHandler::ApplicationSettings() const
- {
- return iEngine->Settings().ApplicationSettings();
- }
-
-// ---------------------------------------------------------------------------
-// From MRadioEngineInitializer
-//
-// ---------------------------------------------------------------------------
-//
-CRadioAudioRouter* CRadioEngineHandler::InitAudioRouterL()
- {
- return CRadioAudioRouter::NewL( iObserver );
- }
-
-// ---------------------------------------------------------------------------
-// From MRadioEngineInitializer
-//
-// ---------------------------------------------------------------------------
-//
-CRadioSystemEventCollector* CRadioEngineHandler::InitSystemEventCollectorL()
- {
- return CRadioSystemEventCollector::NewL();
- }
-
-// ---------------------------------------------------------------------------
-// From MRadioEngineInitializer
-//
-// ---------------------------------------------------------------------------
-//
-CRadioSettings* CRadioEngineHandler::InitSettingsL()
- {
- return CRadioSettings::NewL();
- }
--- a/radioapp/radioenginewrapper/src/radiocontroleventlistener.cpp Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radioenginewrapper/src/radiocontroleventlistener.cpp Fri Jun 25 19:09:05 2010 +0300
@@ -18,7 +18,7 @@
#include "radiocontroleventlistener.h"
#include "radioenginewrapper_p.h"
#include "radioenginewrapperobserver.h"
-#include "cradioenginehandler.h"
+#include "radioenginehandler.h"
#include "radiologger.h"
#include "cradioremcontarget.h"
/*!
@@ -41,10 +41,12 @@
*/
void RadioControlEventListener::init()
{
- TRAPD( err, mRemCon.reset( CRadioRemConTarget::NewL() ) );
+ CRadioRemConTarget* target = NULL;
+ TRAPD( err, target = CRadioRemConTarget::NewL() );
LOG_ASSERT( !err, LOG_FORMAT( "RadioControlEventListener::init Failed with err, %d", err ) );
if ( !err ) {
+ mRemCon.reset( target );
mRemCon->SetControlEventObserver( this );
}
}
@@ -104,7 +106,7 @@
void RadioControlEventListener::MuteL( TBool aMute )
{
LOG_FORMAT( "RadioControlEventListener::MuteL: Mute: %d", aMute );
- mEngine.RadioEnginehandler().SetMuted( aMute );
+ mEngine.radioEnginehandler().setMute( aMute );
}
/*!
@@ -112,10 +114,9 @@
*/
void RadioControlEventListener::PlayL( TBool aDownPressed )
{
- if( aDownPressed )
- {
- mEngine.RadioEnginehandler().SetMuted( false );
- }
+ if ( aDownPressed ) {
+ mEngine.radioEnginehandler().setMute( false );
+ }
}
/*!
@@ -123,10 +124,9 @@
*/
void RadioControlEventListener::PauseL( TBool aDownPressed )
{
- if( aDownPressed )
- {
- mEngine.RadioEnginehandler().SetMuted( true );
- }
+ if ( aDownPressed ) {
+ mEngine.radioEnginehandler().setMute( true );
+ }
}
/*!
@@ -134,11 +134,10 @@
*/
void RadioControlEventListener::PausePlayL( TBool aDownPressed )
{
- if( aDownPressed )
- {
- const TBool muted = !mEngine.RadioEnginehandler().IsMuted();
- mEngine.RadioEnginehandler().SetMuted( muted );
- }
+ if ( aDownPressed ) {
+ const bool muted = !mEngine.radioEnginehandler().isMuted();
+ mEngine.radioEnginehandler().setMute( muted );
+ }
}
/*!
@@ -146,10 +145,9 @@
*/
void RadioControlEventListener::StopL( TBool aDownPressed )
{
- if( aDownPressed )
- {
- mEngine.RadioEnginehandler().SetMuted( ETrue );
- }
+ if ( aDownPressed ) {
+ mEngine.radioEnginehandler().setMute( true );
+ }
}
/*!
@@ -157,7 +155,7 @@
*/
void RadioControlEventListener::ForwardL( TBool aDownPressed )
{
- if( aDownPressed ) {
+ if ( aDownPressed ) {
RUN_NOTIFY_LOOP( mEngine.observers(), skipNext() );
}
}
@@ -167,8 +165,7 @@
*/
void RadioControlEventListener::FastForwardL( TBool aDownPressed )
{
- if( aDownPressed )
- {
+ if ( aDownPressed ) {
mEngine.startSeeking( Seek::Up );
}
}
@@ -178,7 +175,7 @@
*/
void RadioControlEventListener::BackwardL( TBool aDownPressed )
{
- if( aDownPressed ) {
+ if ( aDownPressed ) {
RUN_NOTIFY_LOOP( mEngine.observers(), skipPrevious() );
}
}
@@ -188,7 +185,7 @@
*/
void RadioControlEventListener::RewindL( TBool aDownPressed )
{
- if( aDownPressed ) {
+ if ( aDownPressed ) {
mEngine.startSeeking( Seek::Down );
}
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioapp/radioenginewrapper/src/radioenginehandler.cpp Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,366 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+// User includes
+#include "cradioengine.h"
+#include "cradioaudiorouter.h"
+#include "cradiosystemeventcollector.h"
+#include "cradiosettings.h"
+#include "mradioenginesettings.h"
+#include "cradiorepositorymanager.h"
+#include "mradiordsreceiver.h"
+#include "radioenginehandler.h"
+#include "mradioenginehandlerobserver.h"
+#include "radio_global.h"
+#include "radiologger.h"
+#include "radioenummapper.h"
+
+/*!
+ * Map to translate seek direction enum from its definition in the engine to
+ * its definition in the ui and vice versa
+ */
+BEGIN_ENUM_MAP( KSeekDirectionMap )
+ ENUM_MAP_ITEM( Seek::Down, RadioEngine::ERadioDown ),
+ ENUM_MAP_ITEM( Seek::Up, RadioEngine::ERadioUp )
+END_ENUM_MAP( KSeekDirectionMap )
+
+/*!
+ * Convenience macro to do the mapping of seek directions
+ */
+#define MAP_FROM_UI_DIRECTION(ui_enum) MAP_FROM_UI_ENUM( RadioEngine::TRadioTuneDirection, ui_enum, KSeekDirectionMap )
+
+/*!
+ * Map to translate radio region enum from its definition in the engine to
+ * its definition in the ui and vice versa
+ */
+BEGIN_ENUM_MAP( KRegionMap )
+ ENUM_MAP_ITEM( RadioRegion::None, ERadioRegionNone ),
+ ENUM_MAP_ITEM( RadioRegion::Default, ERadioRegionDefault ),
+ ENUM_MAP_ITEM( RadioRegion::Japan, ERadioRegionJapan ),
+ ENUM_MAP_ITEM( RadioRegion::America, ERadioRegionAmerica ),
+ ENUM_MAP_ITEM( RadioRegion::Poland, ERadioRegionPoland ),
+END_ENUM_MAP( KRegionMap )
+
+/*!
+ * Convenience macros to do the mapping of radio regions
+ */
+#define MAP_FROM_UI_REGION(ui_enum) MAP_FROM_UI_ENUM( TRadioRegion, ui_enum, KRegionMap )
+#define MAP_TO_UI_REGION(engine_enum) MAP_TO_UI_ENUM( RadioRegion::Region, engine_enum, KRegionMap )
+
+/*!
+ * Map to translate seeking state enum from its definition in the engine to
+ * its definition in the ui and vice versa
+ */
+BEGIN_ENUM_MAP( KSeekingStateMap )
+ ENUM_MAP_ITEM( Seek::NotSeeking, RadioEngine::ERadioNotSeeking ),
+ ENUM_MAP_ITEM( Seek::SeekingUp, RadioEngine::ERadioSeekingUp ),
+ ENUM_MAP_ITEM( Seek::SeekingDown, RadioEngine::ERadioSeekingDown )
+END_ENUM_MAP( KSeekingStateMap )
+
+/*!
+ * Convenience macro to do the mapping of seeking states
+ */
+#define MAP_TO_UI_SEEKING_STATE(ui_enum) MAP_TO_UI_ENUM( Seek::State, ui_enum, KSeekingStateMap )
+
+/*!
+ *
+ */
+RadioEngineHandler::RadioEngineHandler( MRadioEngineHandlerObserver& observer )
+ : mObserver( observer )
+{
+}
+
+/*!
+ *
+ */
+RadioEngineHandler::~RadioEngineHandler()
+{
+}
+
+/*!
+ * Attempts to construct the radio engine
+ */
+bool RadioEngineHandler::constructEngine()
+{
+ LOG_METHOD;
+
+ CRadioEngine* engine = NULL;
+ TRAPD( err, engine = CRadioEngine::NewL( *this ) );
+ if ( err ) {
+ return false;
+ }
+
+ mEngine.reset( engine );
+ TRAP( err,
+ mEngine->SystemEventCollector().AddObserverL( &mObserver );
+ mEngine->AddObserverL( &mObserver );
+ );
+ if ( err ) {
+ return false;
+ }
+
+ mRegion = MAP_TO_UI_REGION( mEngine->Settings().EngineSettings().RegionId() );
+ return true;
+}
+
+/*!
+ * Sets the rds data observer
+ */
+void RadioEngineHandler::setRdsObserver( MRadioRdsDataObserver* observer )
+{
+ TRAP_IGNORE( mEngine->RdsReceiver().AddObserverL( observer ) );
+}
+
+/*!
+ * Starts or stops receiving RDS data
+ */
+void RadioEngineHandler::setRdsEnabled( bool rdsEnabled )
+{
+ if ( rdsEnabled ) {
+ mEngine->RdsReceiver().StartReceiver();
+ } else {
+ mEngine->RdsReceiver().StopReceiver();
+ }
+}
+
+/*!
+ * Returns the radio status.
+ */
+bool RadioEngineHandler::isRadioOn()
+{
+ return mEngine->Settings().EngineSettings().IsPowerOn();
+}
+
+/*!
+ * Sets the manual seek status
+ */
+void RadioEngineHandler::setManualSeekMode( bool manualSeek )
+{
+ mEngine->SetManualSeekMode( manualSeek );
+}
+
+/*!
+ * Returns the manual seek status
+ */
+bool RadioEngineHandler::isInManualSeekMode() const
+{
+ return mEngine->IsInManualSeekMode();
+}
+
+/*!
+ * Tune to the specified frequency
+ */
+void RadioEngineHandler::setFrequency( uint frequency )
+{
+ mEngine->SetFrequency( frequency );
+}
+
+/*!
+ * Sets the audio mute state
+ */
+void RadioEngineHandler::setMute( const bool muted, const bool updateSettings )
+{
+ mEngine->SetVolumeMuted( muted, updateSettings );
+}
+
+/*!
+ * Gets the audio mute state
+ */
+bool RadioEngineHandler::isMuted() const
+{
+ return mEngine->Settings().EngineSettings().IsVolMuted();
+}
+
+/*!
+ * Sets the volume level of the FM radio
+ */
+void RadioEngineHandler::setVolume( int newVolume )
+{
+ if ( volume() != newVolume ) {
+ if ( newVolume > 0 ) {
+ mEngine->SetVolumeMuted( EFalse );
+ }
+
+ mEngine->SetVolume( newVolume );
+ }
+}
+
+/*!
+ * Gets the volumelevel.
+ */
+int RadioEngineHandler::volume() const
+{
+ return mEngine->Settings().EngineSettings().Volume();
+}
+
+/*!
+ * Gets the max volumelevel.
+ */
+int RadioEngineHandler::maxVolume() const
+{
+ return mEngine->MaxVolumeLevel();
+}
+
+/*!
+ * Increases the volume by one increment
+ */
+void RadioEngineHandler::increaseVolume()
+{
+ mEngine->AdjustVolume( RadioEngine::ERadioIncVolume );
+}
+
+/*!
+ * Decreases the volume by one increment
+ */
+void RadioEngineHandler::decreaseVolume()
+{
+ mEngine->AdjustVolume( RadioEngine::ERadioDecVolume );
+}
+
+
+/*!
+ * Checks if the antenna is attached
+ */
+bool RadioEngineHandler::isAntennaAttached() const
+{
+ return mEngine->IsAntennaAttached();
+}
+
+/*!
+ * Retrieves the current frequency.
+ */
+uint RadioEngineHandler::currentFrequency() const
+{
+ return mEngine->Settings().EngineSettings().TunedFrequency();
+}
+
+/*!
+ * Returns the minimum allowed frequency in the current region
+ */
+uint RadioEngineHandler::minFrequency() const
+{
+ return mEngine->Settings().EngineSettings().MinFrequency();
+}
+
+/*!
+ * Returns the maximum allowed frequency in the current region
+ */
+uint RadioEngineHandler::maxFrequency() const
+{
+ return mEngine->Settings().EngineSettings().MaxFrequency();
+}
+
+/*!
+ * Checks if the given frequency is valid in the current region
+ */
+bool RadioEngineHandler::isFrequencyValid( uint frequency ) const
+{
+ return mEngine->IsFrequencyValid( frequency );
+}
+
+/*!
+ * Scan up to the next available frequency
+ */
+void RadioEngineHandler::seek( Seek::Direction direction )
+{
+ LOG_TIMESTAMP( "Seek" );
+ mEngine->Seek( MAP_FROM_UI_DIRECTION( direction ) );
+}
+
+/*!
+ * Cancel previously requested scan, and return to the already tuned frequency
+ */
+void RadioEngineHandler::cancelSeek()
+{
+ mEngine->CancelSeek();
+}
+
+/*!
+ * Returns the engine seeking state
+ */
+Seek::State RadioEngineHandler::seekingState() const
+{
+ return MAP_TO_UI_SEEKING_STATE( mEngine->Seeking() );
+}
+
+/*!
+ * return step size for tuning.
+ */
+uint RadioEngineHandler::frequencyStepSize() const
+{
+ return mEngine->Settings().EngineSettings().FrequencyStepSize();
+}
+
+/*!
+ * Returns the selected radio region
+ */
+RadioRegion::Region RadioEngineHandler::region() const
+{
+ return mRegion;
+}
+
+/*!
+ * Sets whether or not audio should be routed to loudspeaker
+ */
+void RadioEngineHandler::setAudioRouteToLoudspeaker( bool loudspeaker )
+{
+ TRAPD( err, mEngine->AudioRouter().SetAudioRouteL( loudspeaker ? RadioEngine::ERadioSpeaker
+ : RadioEngine::ERadioHeadset ) );
+ if ( err ) {
+ LOG_FORMAT( "Failed to set audioroute: UseLoudspeadker: %d", loudspeaker );
+ }
+}
+
+/*!
+ * Checks if audio is routed to loudspeaker
+ */
+bool RadioEngineHandler::isAudioRoutedToLoudspeaker() const
+{
+ return mEngine->Settings().EngineSettings().AudioRoute() == RadioEngine::ERadioSpeaker;
+}
+
+/*!
+ * Returns the repository manager.
+ */
+MRadioApplicationSettings& RadioEngineHandler::applicationSettings() const
+{
+ return mEngine->Settings().ApplicationSettings();
+}
+
+/*!
+ * \reimp
+ */
+CRadioAudioRouter* RadioEngineHandler::InitAudioRouterL()
+{
+ return CRadioAudioRouter::NewL( mObserver );
+}
+
+/*!
+ * \reimp
+ */
+CRadioSystemEventCollector* RadioEngineHandler::InitSystemEventCollectorL()
+{
+ return CRadioSystemEventCollector::NewL();
+}
+
+/*!
+ * \reimp
+ */
+CRadioSettings* RadioEngineHandler::InitSettingsL()
+{
+ return CRadioSettings::NewL();
+}
--- a/radioapp/radioenginewrapper/src/radioenginewrapper.cpp Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radioenginewrapper/src/radioenginewrapper.cpp Fri Jun 25 19:09:05 2010 +0300
@@ -17,8 +17,9 @@
// User includes
#include "radioenginewrapper.h"
+#include "radioenginewrapperobserver.h"
#include "radioenginewrapper_p.h"
-#include "cradioenginehandler.h"
+#include "radioenginehandler.h"
/*!
* Constructor
@@ -33,7 +34,6 @@
*/
RadioEngineWrapper::~RadioEngineWrapper()
{
- delete d_ptr;
}
/*!
@@ -78,7 +78,7 @@
RadioRegion::Region RadioEngineWrapper::region() const
{
Q_D( const RadioEngineWrapper );
- return d->mEngineHandler->Region();
+ return d->mEngineHandler->region();
}
/*!
@@ -87,7 +87,7 @@
uint RadioEngineWrapper::minFrequency() const
{
Q_D( const RadioEngineWrapper );
- return d->mEngineHandler->MinFrequency();
+ return d->mEngineHandler->minFrequency();
}
/*!
@@ -96,7 +96,7 @@
uint RadioEngineWrapper::maxFrequency() const
{
Q_D( const RadioEngineWrapper );
- return d->mEngineHandler->MaxFrequency();
+ return d->mEngineHandler->maxFrequency();
}
/*!
@@ -105,15 +105,15 @@
uint RadioEngineWrapper::frequencyStepSize() const
{
Q_D( const RadioEngineWrapper );
- return d->mEngineHandler->FrequencyStepSize();
+ return d->mEngineHandler->frequencyStepSize();
}
/*!
- * Returns the frequency step size from the selected region
+ * Returns true if frequency is valid, otherwise false
*/
bool RadioEngineWrapper::isFrequencyValid( uint frequency ) const
{
- return frequency >= minFrequency() && frequency <= maxFrequency() && frequency % frequencyStepSize() == 0;
+ return frequency >= minFrequency() && frequency <= maxFrequency();
}
/*!
@@ -122,7 +122,7 @@
bool RadioEngineWrapper::isRadioOn() const
{
Q_D( const RadioEngineWrapper );
- return d->mEngineHandler->IsRadioOn();
+ return d->mEngineHandler->isRadioOn();
}
/*!
@@ -131,7 +131,7 @@
uint RadioEngineWrapper::currentFrequency() const
{
Q_D( const RadioEngineWrapper );
- return d->mEngineHandler->CurrentFrequency();
+ return d->mEngineHandler->currentFrequency();
}
/*!
@@ -140,7 +140,7 @@
bool RadioEngineWrapper::isMuted() const
{
Q_D( const RadioEngineWrapper );
- return d->mEngineHandler->IsMuted();
+ return d->mEngineHandler->isMuted();
}
/*!
@@ -149,7 +149,7 @@
bool RadioEngineWrapper::isAntennaAttached() const
{
Q_D( const RadioEngineWrapper );
- return d->mEngineHandler->IsAntennaAttached();
+ return d->mEngineHandler->isAntennaAttached();
}
/*!
@@ -167,7 +167,10 @@
void RadioEngineWrapper::setManualSeekMode( bool manualSeek )
{
Q_D( RadioEngineWrapper );
- d->mEngineHandler->SetManualSeekMode( manualSeek );
+ d->mEngineHandler->setManualSeekMode( manualSeek );
+ if ( !manualSeek ) {
+ RUN_NOTIFY_LOOP( d->observers(), tunedToFrequency( currentFrequency(), TuneReason::ManualSeekTune ) );
+ }
}
/*!
@@ -176,7 +179,7 @@
bool RadioEngineWrapper::isInManualSeekMode() const
{
Q_D( const RadioEngineWrapper );
- return d->mEngineHandler->IsInManualSeekMode();
+ return d->mEngineHandler->isInManualSeekMode();
}
/*!
@@ -185,7 +188,7 @@
void RadioEngineWrapper::setRdsEnabled( bool rdsEnabled )
{
Q_D( RadioEngineWrapper );
- d->mEngineHandler->SetRdsEnabled( rdsEnabled );
+ d->mEngineHandler->setRdsEnabled( rdsEnabled );
}
/*!
@@ -203,7 +206,7 @@
void RadioEngineWrapper::increaseVolume()
{
Q_D( RadioEngineWrapper );
- d->mEngineHandler->IncreaseVolume();
+ d->mEngineHandler->increaseVolume();
}
/*!
@@ -212,7 +215,7 @@
void RadioEngineWrapper::decreaseVolume()
{
Q_D( RadioEngineWrapper );
- d->mEngineHandler->DecreaseVolume();
+ d->mEngineHandler->decreaseVolume();
}
/*!
@@ -221,7 +224,7 @@
void RadioEngineWrapper::setVolume( int volume )
{
Q_D( RadioEngineWrapper );
- d->mEngineHandler->SetVolume( volume );
+ d->mEngineHandler->setVolume( volume );
}
/*!
@@ -230,7 +233,7 @@
void RadioEngineWrapper::setMute( bool muted, bool updateSettings )
{
Q_D( RadioEngineWrapper );
- d->mEngineHandler->SetMuted( muted, updateSettings );
+ d->mEngineHandler->setMute( muted, updateSettings );
}
/*!
@@ -240,7 +243,7 @@
{
Q_D( RadioEngineWrapper );
d->mUseLoudspeaker = !d->mUseLoudspeaker;
- d->mEngineHandler->SetAudioRouteToLoudspeaker( d->mUseLoudspeaker );
+ d->mEngineHandler->setAudioRouteToLoudspeaker( d->mUseLoudspeaker );
}
/*!
@@ -258,5 +261,5 @@
void RadioEngineWrapper::cancelSeeking()
{
Q_D( RadioEngineWrapper );
- d->mEngineHandler->CancelSeek();
+ d->mEngineHandler->cancelSeek();
}
--- a/radioapp/radioenginewrapper/src/radioenginewrapper_p.cpp Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radioenginewrapper/src/radioenginewrapper_p.cpp Fri Jun 25 19:09:05 2010 +0300
@@ -23,7 +23,7 @@
#include "radiosettings_p.h"
#include "radiologger.h"
#include "radio_global.h"
-#include "cradioenginehandler.h"
+#include "radioenginehandler.h"
#include "radiostationhandlerif.h"
#include "radiocontroleventlistener.h"
#include "radiordslistener.h"
@@ -38,7 +38,7 @@
RadioStationHandlerIf& stationHandler ) :
q_ptr( wrapper ),
mStationHandler( stationHandler ),
- mEngineHandler( new CRadioEngineHandler( *this ) ),
+ mEngineHandler( new RadioEngineHandler( *this ) ),
mControlEventListener( new RadioControlEventListener( *this ) ),
mRdsListener ( new RadioRdsListener( mStationHandler, *this ) ),
mTuneReason( TuneReason::Unspecified ),
@@ -61,17 +61,16 @@
*/
bool RadioEngineWrapperPrivate::init()
{
- TRAPD( err, mEngineHandler->ConstructL() );
- if ( err != KErrNone ) {
- LOG_FORMAT( "RadioEngineWrapperPrivate::init, EngineHandler construct failed: %d", err );
+ if ( !mEngineHandler->constructEngine() ) {
+ LOG( "RadioEngineWrapperPrivate::init, EngineHandler construct failed" );
mEngineHandler.reset();
return false;
}
- mEngineHandler->SetRdsObserver( mRdsListener.data() );
+ mEngineHandler->setRdsObserver( mRdsListener.data() );
mControlEventListener->init();
- mUseLoudspeaker = mEngineHandler->IsAudioRoutedToLoudspeaker();
+ mUseLoudspeaker = mEngineHandler->isAudioRoutedToLoudspeaker();
if ( !mUseLoudspeaker ) {
RUN_NOTIFY_LOOP( mObservers, audioRouteChanged( false ) );
}
@@ -86,7 +85,7 @@
{
if ( !mSettings ) {
mSettings.reset( new RadioSettings() );
- mSettings->d_func()->init( &mEngineHandler->ApplicationSettings() );
+ mSettings->d_func()->init( &mEngineHandler->applicationSettings() );
}
return *mSettings;
}
@@ -94,7 +93,7 @@
/*!
* Returns the enginehandler owned by the engine
*/
-CRadioEngineHandler& RadioEngineWrapperPrivate::RadioEnginehandler()
+RadioEngineHandler& RadioEngineWrapperPrivate::radioEnginehandler()
{
return *mEngineHandler;
}
@@ -104,9 +103,9 @@
*/
void RadioEngineWrapperPrivate::setFrequency( uint frequency, const int reason )
{
- if ( mEngineHandler->CurrentFrequency() != frequency ) {
+ if ( mEngineHandler->currentFrequency() != frequency ) {
mTuneReason = reason;
- mEngineHandler->SetFrequency( frequency );
+ mEngineHandler->setFrequency( frequency );
}
}
@@ -124,7 +123,7 @@
void RadioEngineWrapperPrivate::startSeeking( Seek::Direction direction, const int reason )
{
mTuneReason = reason;
- mEngineHandler->Seek( direction );
+ mEngineHandler->seek( direction );
}
/*!
@@ -150,7 +149,7 @@
const uint frequency = static_cast<uint>( aFrequency );
RUN_NOTIFY_LOOP( mObservers, tunedToFrequency( frequency, mTuneReason ) );
} else {
- RUN_NOTIFY_LOOP( mObservers, tunedToFrequency( mEngineHandler->MinFrequency(), TuneReason::StationScanNoStationsFound ) ); // no frequencies found
+ RUN_NOTIFY_LOOP( mObservers, tunedToFrequency( mEngineHandler->minFrequency(), TuneReason::StationScanNoStationsFound ) ); // no frequencies found
}
}
@@ -201,10 +200,9 @@
/*!
* \reimp
*/
-void RadioEngineWrapperPrivate::SeekingEventL( TInt aSeekingState, TInt aError )
+void RadioEngineWrapperPrivate::SeekingEventL( TInt DEBUGVAR( aSeekingState ), TInt DEBUGVAR( aError ) )
{
- Q_UNUSED( aSeekingState );
- Q_UNUSED( aError );
+ LOG_FORMAT( "RadioEngineWrapperPrivate::SeekingEventL, aSeekingState: %d, Error: %d", aSeekingState, aError );
}
/*!
--- a/radioapp/radioenginewrapper/src/radioenginewrapper_win32.cpp Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radioenginewrapper/src/radioenginewrapper_win32.cpp Fri Jun 25 19:09:05 2010 +0300
@@ -33,7 +33,6 @@
*/
RadioEngineWrapper::~RadioEngineWrapper()
{
- delete d_ptr;
}
/*!
@@ -167,7 +166,10 @@
{
Q_D( RadioEngineWrapper );
d->mManualSeekMode = manualSeek;
-}
+ if ( !manualSeek ) {
+ RUN_NOTIFY_LOOP( d->mObservers, tunedToFrequency( d->mFrequency, d->mTuneReason ) );
+ }
+}
/*!
* Checks if the engine is in manual seek mode
--- a/radioapp/radioenginewrapper/src/radiosettings.cpp Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radioenginewrapper/src/radiosettings.cpp Fri Jun 25 19:09:05 2010 +0300
@@ -45,7 +45,6 @@
*/
RadioSettings::~RadioSettings()
{
- delete d_ptr;
}
/*!
--- a/radioapp/radioenginewrapper/stub/radioenginewrapper_stub.pro Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radioenginewrapper/stub/radioenginewrapper_stub.pro Fri Jun 25 19:09:05 2010 +0300
@@ -35,6 +35,7 @@
INCLUDEPATH += ../../../radioengine/utils/api
INCLUDEPATH += ../../../radioengine/settings/api
INCLUDEPATH += ../../../radioengine/engine/api
+ MMP_RULES += SMPSAFE
}
win32: {
--- a/radioapp/radioenginewrapper/tsrc/t_radioenginewrapper.pro Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radioenginewrapper/tsrc/t_radioenginewrapper.pro Fri Jun 25 19:09:05 2010 +0300
@@ -14,6 +14,7 @@
symbian: {
TARGET.CAPABILITY = CAP_GENERAL_DLL
TARGET.SID = 0x101FF976 # Tried testUids(0x01000111 and 0x01001005) but failed
+ MMP_RULES += SMPSAFE
}
DEPENDPATH += . \
inc \
--- a/radioapp/radiopresetstorage/inc/radiopresetstorage.h Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radiopresetstorage/inc/radiopresetstorage.h Fri Jun 25 19:09:05 2010 +0300
@@ -21,6 +21,7 @@
// System includes
#include <QtGlobal>
#include <QList>
+#include <QScopedPointer>
#include "radiopresetstorageexport.h"
@@ -30,7 +31,7 @@
class STORAGE_DLL_EXPORT RadioPresetStorage
{
- Q_DECLARE_PRIVATE_D( d_ptr, RadioPresetStorage )
+ Q_DECLARE_PRIVATE_D( d_ptr.data(), RadioPresetStorage )
Q_DISABLE_COPY( RadioPresetStorage )
public:
@@ -52,7 +53,7 @@
/**
* Unmodifiable pointer to the private implementation
*/
- RadioPresetStoragePrivate* const d_ptr;
+ const QScopedPointer<RadioPresetStoragePrivate> d_ptr;
};
--- a/radioapp/radiopresetstorage/radiopresetstorage.pro Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radiopresetstorage/radiopresetstorage.pro Fri Jun 25 19:09:05 2010 +0300
@@ -14,6 +14,7 @@
# Description:
#
+TMP_DIR_NAME = presetstorage
include(../buildflags.pri)
TEMPLATE = lib
--- a/radioapp/radiopresetstorage/src/radiopresetstorage.cpp Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radiopresetstorage/src/radiopresetstorage.cpp Fri Jun 25 19:09:05 2010 +0300
@@ -48,7 +48,6 @@
*/
RadioPresetStorage::~RadioPresetStorage()
{
- delete d_ptr;
}
/*!
@@ -104,11 +103,11 @@
Q_D( RadioPresetStorage );
TPreset preset;
preset.SetFrequency( station.frequency() );
- TPresetName name( station.name().utf16() );
+ TPresetName name( station.name().left( KPresetNameLength ).utf16() );
preset.SetName( name );
preset.SetRenamedByUser( station.isRenamedByUser() );
preset.SetGenre( station.genre() );
- TRadioUrl url( station.url().utf16() );
+ TRadioUrl url( station.url().left( KUrlMaxLength ).utf16() );
preset.SetUrl( url );
preset.SetPiCode( station.piCode() );
preset.SetFavorite( station.isFavorite() );
--- a/radioapp/radiopresetstorage/tsrc/t_radiopresetstorage.pro Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radiopresetstorage/tsrc/t_radiopresetstorage.pro Fri Jun 25 19:09:05 2010 +0300
@@ -20,6 +20,7 @@
symbian: {
TARGET.CAPABILITY = CAP_GENERAL_DLL
TARGET.SID = 0x101FF976 # Old visual radio uid
+ MMP_RULES += SMPSAFE
}
DEPENDPATH += . \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioapp/radiouiengine/inc/radiohistorydatabase.h Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,58 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+#ifndef RADIOHISTORYDATABASE_H
+#define RADIOHISTORYDATABASE_H
+
+// System includes
+#include <QScopedPointer>
+
+// User includes
+
+// Forward declarations
+class QSqlDatabase;
+class QSqlQuery;
+
+/*!
+ *
+ */
+class RadioHistoryDatabase
+{
+public:
+
+ RadioHistoryDatabase();
+ ~RadioHistoryDatabase();
+
+ void addItem( const QString& artist, const QString& title,
+ const QString& stationName, uint frequency, bool fromRds );
+
+ void clearRecent();
+ void clearTagged();
+
+private:
+
+ bool connectToDatabase();
+
+ void commitTransaction( QSqlQuery& query );
+
+private: // data
+
+ QScopedPointer<QSqlDatabase> mDatabase;
+
+};
+
+#endif // RADIOHISTORYDATABASE_H
--- a/radioapp/radiouiengine/inc/radiohistoryitem.h Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radiouiengine/inc/radiohistoryitem.h Fri Jun 25 19:09:05 2010 +0300
@@ -19,8 +19,8 @@
#define RADIOHISTORYITEM_H
// System includes
+#include <QSharedDataPointer>
#include <QMetaType>
-#include <QObject>
// User includes
#include "radiouiengineexport.h"
@@ -30,12 +30,8 @@
/*!
* Radio history item implements a song recognized from the radio broadcast
- *
- * Note! It is derived from QObject even though architecturally it shouldn't be.
- * It is done only to satisfy the WINSCW build which doesn't export the destructor in UREL
- * build. This causes mismatching def files and annoying warnings. Deriving from QObject fixes this
*/
-class UI_ENGINE_DLL_EXPORT RadioHistoryItem : public QObject
+class UI_ENGINE_DLL_EXPORT RadioHistoryItem
{
public:
@@ -71,36 +67,23 @@
bool isRecognizedByRds() const;
-private:
-
- /**
- * Decrements the reference count of the implicitly shared data.
- * Data is deleted if no instance uses it anymore.
- */
- void decrementReferenceCount();
-
private: // data
- /**
+ /*!
* Pointer to the implicitly shared private implementation
* Own.
*/
- class RadioHistoryItemPrivate* mData;
+ QSharedDataPointer<RadioHistoryItemPrivate> mData;
public:
/**
- * Detach from the implicitly shared data
- */
- void detach();
-
- /**
* Checks if the class is detached from implicitly shared data
* Required by many QT convenience functions for implicitly shared classes
*/
bool isDetached() const;
- typedef RadioHistoryItemPrivate* DataPtr;
+ typedef QSharedDataPointer<RadioHistoryItemPrivate> DataPtr;
inline DataPtr &data_ptr() { return mData; }
};
--- a/radioapp/radiouiengine/inc/radiohistoryitem_p.h Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radiouiengine/inc/radiohistoryitem_p.h Fri Jun 25 19:09:05 2010 +0300
@@ -19,6 +19,7 @@
#define RADIOHISTORYITEM_H
// System includes
+#include <QSharedData>
#include <QString>
#include <QDateTime>
@@ -43,11 +44,12 @@
};
}
-class RadioHistoryItemPrivate
+class RadioHistoryItemPrivate : public QSharedData
{
public:
RadioHistoryItemPrivate();
+ RadioHistoryItemPrivate( const RadioHistoryItemPrivate& other );
RadioHistoryItemPrivate( const QString& artist, const QString& title );
void init( const QString& artist, const QString& title );
@@ -56,13 +58,6 @@
public: // data
- /**
- * Reference count used for implicit sharing.
- * Has to be named "ref" instead having the 'm' prefix like all other member variables in Radio
- * This is because convenience functions like qAtomicAssign() expect it to be named "ref"
- */
- QAtomicInt ref;
-
int mId;
QString mArtist;
--- a/radioapp/radiouiengine/inc/radiohistorymodel.h Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radiouiengine/inc/radiohistorymodel.h Fri Jun 25 19:09:05 2010 +0300
@@ -20,6 +20,7 @@
// System includes
#include <QAbstractListModel>
+#include <QScopedPointer>
// User includes
#include "radiouiengineexport.h"
@@ -35,7 +36,7 @@
class UI_ENGINE_DLL_EXPORT RadioHistoryModel : public QAbstractListModel
{
Q_OBJECT
- Q_DECLARE_PRIVATE_D( d_ptr, RadioHistoryModel )
+ Q_DECLARE_PRIVATE_D( d_ptr.data(), RadioHistoryModel )
Q_DISABLE_COPY( RadioHistoryModel )
friend class RadioUiEngine;
@@ -102,7 +103,7 @@
/**
* Unmodifiable pointer to the private implementation
*/
- RadioHistoryModelPrivate* const d_ptr;
+ const QScopedPointer<RadioHistoryModelPrivate> d_ptr;
};
--- a/radioapp/radiouiengine/inc/radiomonitorservice.h Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radiouiengine/inc/radiomonitorservice.h Fri Jun 25 19:09:05 2010 +0300
@@ -20,7 +20,6 @@
// System includes
#include <xqserviceprovider.h>
-#include <QPointer>
// User includes
#include "radioservicedef.h"
@@ -67,6 +66,8 @@
void checkIfCurrentStationIsFavorite();
+ QString trimHtmlTags( const QString& html );
+
void notify( const QVariant& notification );
void notifyList( const QVariantList& list );
@@ -80,7 +81,7 @@
QVariantList mNotificationList;
- QPointer<QTimer> mNotificationTimer;
+ QTimer* mNotificationTimer;
};
--- a/radioapp/radiouiengine/inc/radioscannerengine.h Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radiouiengine/inc/radioscannerengine.h Fri Jun 25 19:09:05 2010 +0300
@@ -20,6 +20,7 @@
// System includes
#include <QObject>
+#include <QScopedPointer>
#include <QMap>
// User includes
@@ -37,11 +38,11 @@
class UI_ENGINE_DLL_EXPORT RadioScannerEngine : public QObject
{
Q_OBJECT
- Q_DECLARE_PRIVATE_D( d_ptr, RadioScannerEngine )
+ Q_DECLARE_PRIVATE_D( d_ptr.data(), RadioScannerEngine )
Q_DISABLE_COPY( RadioScannerEngine )
friend class RadioUiEngine;
-
+
public:
explicit RadioScannerEngine( RadioUiEnginePrivate& uiEngine );
@@ -88,7 +89,7 @@
/**
* Unmodifiable pointer to the private implementation
*/
- RadioScannerEnginePrivate* const d_ptr;
+ const QScopedPointer<RadioScannerEnginePrivate> d_ptr;
};
--- a/radioapp/radiouiengine/inc/radiostation.h Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radiouiengine/inc/radiostation.h Fri Jun 25 19:09:05 2010 +0300
@@ -19,9 +19,10 @@
#define RADIOSTATION_H_
// System includes
+#include <QObject>
+#include <QSharedDataPointer>
#include <QString>
#include <QMetaType>
-#include <QObject>
// User includes
#include "radiouiengineexport.h"
@@ -49,7 +50,7 @@
friend class RadioStationModelPrivate;
friend class TestRadioUiEngine;
friend class TestRadioPresetStorage;
-
+
public:
/**
@@ -81,7 +82,7 @@
Favorite = 1 << 0,
LocalStation = 1 << 1,
PreDefined = 1 << 2,
- Temporary = 1 << 3
+ ManualStation = 1 << 3
};
Q_DECLARE_FLAGS( Type, TypeFlag )
@@ -101,6 +102,7 @@
* Magical values used as preset indexes to signify certain conditions.
* NotFound means that a find function could not find a station
* Invalid means that the station instance has not been initialized
+ * SharedNull identifies the empty "null" station that every newly created station points to
*/
enum PresetFlag { NotFound = -1, Invalid = -100, SharedNull = -200 };
@@ -116,7 +118,7 @@
RadioStation& operator=( const RadioStation& other );
-public:
+private:
explicit RadioStation( int presetIndex, uint frequency );
@@ -149,8 +151,7 @@
int genre() const;
- QString frequencyMhz() const;
- QString nameOrFrequencyMhz() const;
+ QString frequencyString() const;
uint frequency() const;
int presetIndex() const;
@@ -159,13 +160,23 @@
QString url() const;
- bool hasPiCode() const;
- bool hasRds() const;
+ int piCode() const;
void setType( RadioStation::Type type );
void unsetType( RadioStation::Type type );
bool isType( RadioStation::Type type ) const;
+ // Convenience checkers
+
+ inline bool hasPiCode() const { return piCode() != -1; }
+ inline bool hasName() const { return !name().isEmpty(); }
+ inline bool hasUrl() const { return !url().isEmpty(); }
+ inline bool hasRadiotext() const { return !radioText().isEmpty(); }
+ inline bool hasDynamicPs() const { return !dynamicPsText().isEmpty(); }
+ inline bool hasGenre() const { return genre() != -1; }
+ inline bool hasRds() const { return hasPiCode() || hasGenre() || hasDynamicPs() ||
+ hasRadiotext() || hasUrl() || ( !hasName() && !isRenamed() ); }
+
// Getters for non-persistent data
PsType psType() const;
@@ -178,12 +189,6 @@
private:
- /**
- * Decrements the reference count of the implicitly shared data.
- * Data is deleted if no instance uses it anymore.
- */
- void decrementReferenceCount();
-
// Methods for converting PI code into call sign
QString piCodeToCallSign( uint programmeIdentification );
QString iterateCallSign( int piBase, int programmeIdentification );
@@ -196,23 +201,18 @@
* Pointer to the implicitly shared private implementation
* Own.
*/
- class RadioStationPrivate* mData;
+ QSharedDataPointer<RadioStationPrivate> mData;
public:
/**
- * Detach from the implicitly shared data
- */
- void detach();
-
- /**
* Checks if the class is detached from implicitly shared data
* Required by many QT convenience functions for implicitly shared classes
*/
bool isDetached() const;
- typedef RadioStationPrivate* DataPtr;
- inline DataPtr &data_ptr() { return mData; }
+ typedef QSharedDataPointer<RadioStationPrivate> DataPtr;
+ inline DataPtr& data_ptr() { return mData; }
};
--- a/radioapp/radiouiengine/inc/radiostation_p.h Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radiouiengine/inc/radiostation_p.h Fri Jun 25 19:09:05 2010 +0300
@@ -19,6 +19,7 @@
#define RADIOSTATIONINFO_P_H_
// System includes
+#include <QSharedData>
#include <QTime>
// User includes
@@ -26,12 +27,13 @@
#include "radiostationif.h"
// Class declaration
-class RadioStationPrivate : public RadioStationIf
+class RadioStationPrivate : public QSharedData
+ , public RadioStationIf
{
public:
explicit RadioStationPrivate( int presetIndex = RadioStation::Invalid, uint frequency = 0 );
- explicit RadioStationPrivate( RadioStation::PresetFlag flag );
+ explicit RadioStationPrivate( const RadioStationPrivate& other );
virtual ~RadioStationPrivate();
@@ -62,24 +64,11 @@
public: // data
- /**
- * Reference count used for implicit sharing.
- * Has to be named "ref" instead having the 'm' prefix like all other member variables in Radio
- * This is because convenience functions like qAtomicAssign() expect it to be named "ref"
- */
- QAtomicInt ref;
-
// ========================================================================
// Persistent data. Saved to Central repository
// ========================================================================
/**
- * Station frequency. The most important bit of information about a radio station.
- * Is checked to be non-null in the isValid() function
- */
- uint mFrequency;
-
- /**
* Station index in the Preset Utility.
* Negative values signify an invalid RadioStation that has not and will not be saved.
* Initialized to -100 by default to indicate and invalid station.
@@ -87,6 +76,12 @@
int mPresetIndex;
/**
+ * Station frequency. The most important bit of information about a radio station.
+ * Is checked to be non-null in the isValid() function
+ */
+ uint mFrequency;
+
+ /**
* Station name. Contains a name that is set in one of the following ways:
* 1) Received through RDS as the stations PS name and station does not use dynamic PS
* 2) Entered by the user. In this case the mRenamedByUser flag will be set and the name
--- a/radioapp/radiouiengine/inc/radiostationmodel.h Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radiouiengine/inc/radiostationmodel.h Fri Jun 25 19:09:05 2010 +0300
@@ -20,6 +20,7 @@
// System includes
#include <QAbstractListModel>
+#include <QScopedPointer>
#include <QMap>
// User includes
@@ -39,11 +40,20 @@
// Constants
typedef QMap<uint,RadioStation> Stations;
+namespace FindCriteria
+{
+ enum Criteria
+ {
+ OnlySavedStations,
+ IncludeManualStation
+ };
+}
+
// Class declaration
class UI_ENGINE_DLL_EXPORT RadioStationModel : public QAbstractListModel
{
Q_OBJECT
- Q_DECLARE_PRIVATE_D( d_ptr, RadioStationModel )
+ Q_DECLARE_PRIVATE_D( d_ptr.data(), RadioStationModel )
Q_DISABLE_COPY( RadioStationModel )
public:
@@ -96,9 +106,15 @@
RadioStation stationAt( int index ) const;
/*!
- * Functions to find stations by frequency
+ * Finds a station by frequency
*/
- bool findFrequency( uint frequency, RadioStation& station ) const;
+ bool findFrequency( uint frequency, RadioStation& station, FindCriteria::Criteria criteria = FindCriteria::OnlySavedStations ) const;
+
+ /*!
+ * Convenience function to find a radio station.
+ * Internally uses findFrequency() and returns an invalid station if the given frequency is not found
+ */
+ RadioStation findStation( uint frequency, FindCriteria::Criteria criteria = FindCriteria::OnlySavedStations ) const;
/*!
* Functions to find stations by preset index
@@ -200,18 +216,12 @@
*/
int findUnusedPresetIndex();
- /**
- * Used by the RDS data setters to find the correct station where the data is set
- * First tries the currentStation variable and if the frequency doesn't match, finds the right one
- */
- RadioStation findCurrentStation( uint frequency );
-
private: // data
/**
* Unmodifiable pointer to the private implementation
*/
- RadioStationModelPrivate* const d_ptr;
+ const QScopedPointer<RadioStationModelPrivate> d_ptr;
};
--- a/radioapp/radiouiengine/inc/radiouiengine.h Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radiouiengine/inc/radiouiengine.h Fri Jun 25 19:09:05 2010 +0300
@@ -22,6 +22,8 @@
// System includes
#include <QObject>
#include <QString>
+#include <QScopedPointer>
+#include <QSharedPointer>
// User includes
#include "radiouiengineexport.h"
@@ -37,20 +39,37 @@
class RadioScannerEngine;
class RadioMonitorService;
+typedef QSharedPointer<RadioScannerEngine> RadioScannerEnginePtr;
+
+// Constants
+const uint DEFAULT_MIN_FREQUENCY = 87500000;
+
class UI_ENGINE_DLL_EXPORT RadioUiEngine : public QObject
{
Q_OBJECT
- Q_DECLARE_PRIVATE_D( d_ptr, RadioUiEngine )
+ Q_DECLARE_PRIVATE_D( d_ptr.data(), RadioUiEngine )
Q_DISABLE_COPY( RadioUiEngine )
friend class RadioScannerEngine;
-public:
+public: // Static functions that are used before the ui engine is created
+
+ /*!
+ * Gets the last tuned frequency from central repository
+ */
+ static uint lastTunedFrequency( uint defaultFrequency = DEFAULT_MIN_FREQUENCY );
- /**
- * Static functions that are used before the ui engine is created
+ /*!
+ * Gets the last used volume level
*/
- static uint lastTunedFrequency();
+ static int lastVolume();
+
+ /*!
+ * Launches the radio server process
+ */
+ static void launchRadioServer();
+
+public:
RadioUiEngine( QObject* parent = 0 );
~RadioUiEngine();
@@ -72,7 +91,7 @@
RadioSettingsIf& settings();
RadioStationModel& stationModel();
RadioHistoryModel& historyModel();
- RadioScannerEngine* createScannerEngine();
+ RadioScannerEnginePtr createScannerEngine();
RadioScannerEngine* scannerEngine();
bool isRadioOn() const;
@@ -102,6 +121,8 @@
enum MusicStore{ OviStore, OtherStore };
void openMusicStore( const RadioHistoryItem& item, MusicStore store = OviStore );
+ void launchBrowser( const QString& url );
+
void setManualSeekMode( bool manualSeek );
bool isInManualSeekMode() const;
@@ -158,7 +179,7 @@
/**
* Unmodifiable pointer to the private implementation
*/
- RadioUiEnginePrivate* const d_ptr;
+ const QScopedPointer<RadioUiEnginePrivate> d_ptr;
};
--- a/radioapp/radiouiengine/inc/radiouiengine_p.h Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radiouiengine/inc/radiouiengine_p.h Fri Jun 25 19:09:05 2010 +0300
@@ -20,7 +20,7 @@
// System includes
#include <QScopedPointer>
-#include <QPointer>
+#include <QSharedPointer>
// User includes
#include "radio_global.h"
@@ -98,13 +98,13 @@
QScopedPointer<RadioMonitorService> mMonitorService;
- QPointer<RadioScannerEngine> mScannerEngine;
+ QWeakPointer<RadioScannerEngine> mScannerEngine;
/**
* Power off timer
* Owned by public class by setting parent
*/
- QPointer<QTimer> mPowerOffTimer;
+ QTimer* mPowerOffTimer;
};
--- a/radioapp/radiouiengine/radiouiengine.pro Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radiouiengine/radiouiengine.pro Fri Jun 25 19:09:05 2010 +0300
@@ -14,6 +14,7 @@
# Description:
#
+TMP_DIR_NAME = uiengine
include(../buildflags.pri)
TEMPLATE = lib
@@ -23,7 +24,7 @@
symbian:TARGET.UID3 = 0x2002EADA
-# Wrapper does not depend on QtGui or Orbit
+# UI engine does not depend on Orbit
QT = core gui network sql
CONFIG -= hb
@@ -41,15 +42,13 @@
DEPENDPATH += $$INCLUDEPATH src
-# $$_PRO_FILE_PWD_ points to the directory of the pro file
-MOC_DIR = $$_PRO_FILE_PWD_/tmp
-
# Input
HEADERS += radiouiengineexport.h
HEADERS += radiostation.h
HEADERS += radiostationmodel.h
HEADERS += radiouiengine.h
HEADERS += radiohistoryitem.h
+HEADERS += radiohistorydatabase.h
HEADERS += radiohistorymodel.h
HEADERS += radioscannerengine.h
HEADERS += radioservicedef.h
@@ -75,6 +74,7 @@
SOURCES += radiouiengine_p.cpp
SOURCES += radiohistoryitem.cpp
SOURCES += radiohistoryitem_p.cpp
+SOURCES += radiohistorydatabase.cpp
SOURCES += radiohistorymodel.cpp
SOURCES += radiohistorymodel_p.cpp
SOURCES += radioscannerengine.cpp
--- a/radioapp/radiouiengine/src/radiocontrolservice.cpp Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radiouiengine/src/radiocontrolservice.cpp Fri Jun 25 19:09:05 2010 +0300
@@ -30,13 +30,10 @@
*
*/
RadioControlService::RadioControlService( RadioUiEngine& engine ) :
- XQServiceProvider( RADIO_CONTROL_SERVICE, &engine ),
+ XQServiceProvider( RADIO_SERVICE +"."+ RADIO_CONTROL_SERVICE, &engine ),
mUiEngine( engine )
{
publishAll();
- if ( XQServiceUtil::isService() ) {
- XQServiceUtil::toBackground( true );
- }
}
/*!
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioapp/radiouiengine/src/radiohistorydatabase.cpp Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,188 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+// System includes
+#include <QSqlDatabase>
+#include <QSqlQuery>
+#include <QSqlError>
+#include <QStringList>
+#include <QFile>
+#include <QDateTime>
+#include <QVariant>
+//#include <QSqlRecord>
+
+// User includes
+#include "radiohistorydatabase.h"
+#include "radiologger.h"
+
+static const QLatin1String DATABASE_NAME ( "radioplayhistory.db" );
+static const QLatin1String DATABASE_DRIVER ( "QSQLITE" );
+static const QLatin1String HISTORY_TABLE ( "history" );
+static const QLatin1String SQL_CREATE_TABLE ( "CREATE TABLE history ("
+ "id INTEGER PRIMARY KEY AUTOINCREMENT, "
+ "artist TEXT NOT NULL, "
+ "title TEXT NOT NULL, "
+ "station TEXT NOT NULL, "
+ "frequency INTEGER NOT NULL, "
+ "tagged INTEGER NOT NULL DEFAULT 0, "
+ "fromRds INTEGER NOT NULL DEFAULT 1, "
+ "time INTEGER NOT NULL)" );
+
+static const QLatin1String SQL_ADD_ITEM ( "INSERT INTO history (artist,title,station,frequency,fromRds,time) "
+ "VALUES ( ?,?,?,?,?,? )" );
+
+static const QLatin1String SQL_SELECT_ALL ( "SELECT * FROM history ORDER BY id DESC" );
+static const QLatin1String SQL_SELECT_TAGGED( "SELECT * FROM history WHERE tagged=1" );// ORDER BY id DESC";
+
+static const QLatin1String SQL_DELETE_ALL ( "DELETE FROM history" );
+static const QLatin1String SQL_DELETE_RECENT( "DELETE FROM history WHERE tagged=0" );
+//static const QLatin1String SQL_DELETE_TAGGED = "DELETE FROM history WHERE tagged=1";
+static const QLatin1String SQL_CLEAR_TAGS ( "UPDATE history SET tagged = 0 WHERE tagged = 1" );
+
+//static static const QLatin1String SQL_FIND_ITEM_BY_ID( "SELECT * FROM history WHERE id = ?" );
+static const QLatin1String SQL_TOGGLE_TAG ( "UPDATE history SET tagged = ? WHERE id = ?" );
+
+#ifdef LOGGING_ENABLED
+# define GET_ERR( param ) GETSTRING( param.lastError().text() )
+# define GET_ERR_PTR( param ) GETSTRING( param->lastError().text() )
+#endif // LOGGING_ENABLED
+
+/*!
+ *
+ */
+RadioHistoryDatabase::RadioHistoryDatabase()
+{
+ connectToDatabase();
+}
+
+/*!
+ *
+ */
+RadioHistoryDatabase::~RadioHistoryDatabase()
+{
+ if ( mDatabase && mDatabase->isOpen() ) {
+ mDatabase->close();
+ }
+}
+
+/*!
+ *
+ */
+void RadioHistoryDatabase::addItem( const QString& artist,
+ const QString& title,
+ const QString& stationName,
+ uint frequency,
+ bool fromRds )
+{
+ LOG_FORMAT( "RadioHistoryModelPrivate::addItem. Artist: %s, Title: %s", GETSTRING( artist ), GETSTRING( title ) );
+
+ QSqlQuery query( *mDatabase );
+ mDatabase->transaction();
+
+ query.prepare( SQL_ADD_ITEM );
+ query.addBindValue( artist );
+ query.addBindValue( title );
+ query.addBindValue( stationName );
+ query.addBindValue( static_cast<int>( frequency / 1000 ) );
+ query.addBindValue( fromRds );
+ query.addBindValue( QDateTime::currentDateTime().toTime_t() );
+
+ commitTransaction( query );
+}
+
+/*!
+ *
+ */
+void RadioHistoryDatabase::clearRecent()
+{
+ QSqlQuery query( *mDatabase );
+ mDatabase->transaction();
+
+ query.prepare( SQL_CLEAR_TAGS );
+
+ commitTransaction( query );
+}
+
+/*!
+ *
+ */
+void RadioHistoryDatabase::clearTagged()
+{
+ QSqlQuery query( *mDatabase );
+ mDatabase->transaction();
+
+ query.prepare( SQL_DELETE_ALL );
+
+ commitTransaction( query );
+}
+
+/*!
+ *
+ */
+bool RadioHistoryDatabase::connectToDatabase()
+{
+ LOG_METHOD;
+ QSqlDatabase db = QSqlDatabase::addDatabase( DATABASE_DRIVER );
+ if ( db.isValid() ) {
+ mDatabase.reset( new QSqlDatabase( db ) );
+ mDatabase->setDatabaseName( DATABASE_NAME );
+
+ if ( !mDatabase->open() ) {
+ LOG_FORMAT( "Failed to open database! error = %s", GET_ERR_PTR( mDatabase ) );
+ mDatabase.reset();
+ return false;
+ }
+
+ // Create the table if it does not exist
+ if ( !mDatabase->tables().contains( HISTORY_TABLE ) ) {
+ LOG( "RadioHistoryModelPrivate::connectToDatabase: Creating database tables." );
+ QSqlQuery query;
+ if ( !query.exec( SQL_CREATE_TABLE ) ) {
+ LOG_FORMAT( "Database creation failed! error = %s", GET_ERR( query ) );
+ mDatabase->close();
+ mDatabase.reset();
+ return false;
+ }
+ }
+ } else {
+ LOG_FORMAT( "Invalid database! error = %s", GET_ERR( db ) );
+ return false;
+ }
+
+ return true;
+}
+
+/*!
+ *
+ */
+void RadioHistoryDatabase::commitTransaction( QSqlQuery& query )
+{
+ LOG_METHOD;
+
+ bool success = false;
+ Q_UNUSED( success );
+ if ( query.exec() ) {
+
+ success = mDatabase->commit();
+ LOG_ASSERT( success, LOG_FORMAT( "Commit failed! err: %s", GET_ERR_PTR( mDatabase ) ) );
+
+ } else {
+ LOG_FORMAT( "RadioHistoryModelPrivate::commitTransaction FAILED, rolling back: error = %s", GET_ERR( query ) );
+ success = mDatabase->rollback();
+ LOG_ASSERT( success, LOG_FORMAT( "Rollback failed! err: %s", GET_ERR_PTR( mDatabase ) ) );
+ }
+}
--- a/radioapp/radiouiengine/src/radiohistoryitem.cpp Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radiouiengine/src/radiohistoryitem.cpp Fri Jun 25 19:09:05 2010 +0300
@@ -29,9 +29,8 @@
*
*/
RadioHistoryItem::RadioHistoryItem() :
- QObject( 0 )
+ mData( shared_null() )
{
- mData = shared_null();
mData->ref.ref();
}
@@ -39,19 +38,16 @@
*
*/
RadioHistoryItem::RadioHistoryItem( const QString& artist, const QString& title ) :
- QObject( 0 )
+ mData( new RadioHistoryItemPrivate( artist, title ) )
{
- mData = new RadioHistoryItemPrivate( artist, title );
}
/*!
*
*/
RadioHistoryItem::RadioHistoryItem( const RadioHistoryItem& other ) :
- QObject( 0 )
+ mData( other.mData )
{
- mData = other.mData;
- mData->ref.ref();
}
/*!
@@ -59,7 +55,6 @@
*/
RadioHistoryItem::~RadioHistoryItem()
{
- decrementReferenceCount();
}
/*!
@@ -67,7 +62,7 @@
*/
RadioHistoryItem& RadioHistoryItem::operator=( const RadioHistoryItem& other )
{
- qAtomicAssign( mData, other.mData );
+ mData = other.mData;
return *this;
}
@@ -84,9 +79,7 @@
*/
void RadioHistoryItem::reset()
{
- decrementReferenceCount();
mData = shared_null();
- mData->ref.ref();
}
/*!
@@ -111,7 +104,6 @@
void RadioHistoryItem::setArtist( const QString& artist )
{
if ( artist.compare( mData->mArtist ) != 0 ) {
- detach();
mData->mArtist = artist;
}
}
@@ -130,7 +122,6 @@
void RadioHistoryItem::setTitle( const QString& title )
{
if ( title.compare( mData->mTitle ) != 0 ) {
- detach();
mData->mTitle = title;
}
}
@@ -149,7 +140,6 @@
void RadioHistoryItem::setStation( const QString& station )
{
if ( station.compare( mData->mStation ) != 0 ) {
- detach();
mData->mStation = station;
}
}
@@ -168,7 +158,6 @@
void RadioHistoryItem::setFrequency( uint frequency )
{
if ( frequency != mData->mFrequency ) {
- detach();
mData->mFrequency = frequency;
}
}
@@ -186,11 +175,9 @@
*/
void RadioHistoryItem::setCurrentTime()
{
- detach();
- mData->mTime.currentDateTime();
+ mData->mTime = QDateTime::currentDateTime();
}
-
/*!
*
*/
@@ -207,34 +194,8 @@
return mData->mFromRds;
}
-/**
- * Decrements the reference count of the implicitly shared data.
- */
-void RadioHistoryItem::decrementReferenceCount()
-{
- if ( !mData->ref.deref() ) {
- delete mData;
- mData = 0;
- }
-}
-
-/**
- * Detach from the implicitly shared data
- */
-void RadioHistoryItem::detach()
-{
- if ( !isDetached() ) {
- RadioHistoryItemPrivate* newData = new RadioHistoryItemPrivate( *mData );
-
- decrementReferenceCount();
-
- newData->ref = 1;
- mData = newData;
- }
-}
-
-/**
- * Checks if the class is detached from implicitly shared data
+/*!
+ *
*/
bool RadioHistoryItem::isDetached() const
{
--- a/radioapp/radiouiengine/src/radiohistoryitem_p.cpp Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radiouiengine/src/radiohistoryitem_p.cpp Fri Jun 25 19:09:05 2010 +0300
@@ -34,6 +34,20 @@
/*!
*
*/
+RadioHistoryItemPrivate::RadioHistoryItemPrivate( const RadioHistoryItemPrivate& other ) :
+ QSharedData( other ),
+ mId( other.mId ),
+ mArtist( other.mArtist ),
+ mTitle( other.mTitle ),
+ mFrequency( other.mFrequency ),
+ mTagged( other.mTagged ),
+ mFromRds( other.mFromRds )
+{
+}
+
+/*!
+ *
+ */
RadioHistoryItemPrivate::RadioHistoryItemPrivate( const QString& artist,
const QString& title )
{
@@ -45,7 +59,6 @@
*/
void RadioHistoryItemPrivate::init( const QString& artist, const QString& title )
{
- ref = 1;
mId = -1;
mArtist = artist;
mTitle = title;
--- a/radioapp/radiouiengine/src/radiohistorymodel.cpp Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radiouiengine/src/radiohistorymodel.cpp Fri Jun 25 19:09:05 2010 +0300
@@ -49,7 +49,6 @@
*/
RadioHistoryModel::~RadioHistoryModel()
{
- delete d_ptr;
}
/*!
@@ -121,6 +120,7 @@
{
Q_D( RadioHistoryModel );
d->setViewMode( showTagged ? RadioHistoryModelPrivate::ShowTagged : RadioHistoryModelPrivate::ShowAll );
+ reset();
}
/*!
--- a/radioapp/radiouiengine/src/radiohistorymodel_p.cpp Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radiouiengine/src/radiohistorymodel_p.cpp Fri Jun 25 19:09:05 2010 +0300
@@ -33,33 +33,32 @@
#include "radiostation.h"
#include "radiologger.h"
-const char* DATABASE_NAME = "radioplayhistory.db";
-const char* DATABASE_DRIVER = "QSQLITE";
-const char* HISTORY_TABLE = "history";
-const char* SQL_CREATE_TABLE = "CREATE TABLE history ("
- "id INTEGER PRIMARY KEY AUTOINCREMENT, "
- "artist TEXT NOT NULL, "
- "title TEXT NOT NULL, "
- "station TEXT NOT NULL, "
- "frequency INTEGER NOT NULL, "
- "tagged INTEGER NOT NULL DEFAULT 0, "
- "fromRds INTEGER NOT NULL DEFAULT 1, "
- "time TIMESTAMP NOT NULL)";
+static const QLatin1String DATABASE_NAME ( "radioplayhistory.db" );
+static const QLatin1String DATABASE_DRIVER ( "QSQLITE" );
+static const QLatin1String HISTORY_TABLE ( "history" );
+static const QLatin1String SQL_CREATE_TABLE ( "CREATE TABLE history ("
+ "id INTEGER PRIMARY KEY AUTOINCREMENT, "
+ "artist TEXT NOT NULL, "
+ "title TEXT NOT NULL, "
+ "station TEXT NOT NULL, "
+ "frequency INTEGER NOT NULL, "
+ "tagged INTEGER NOT NULL DEFAULT 0, "
+ "fromRds INTEGER NOT NULL DEFAULT 1, "
+ "time INTEGER NOT NULL)" );
-const char* SQL_ADD_ITEM = "INSERT INTO history (artist,title,station,frequency,fromRds,time) "
- "VALUES ( ?,?,?,?,?,? )";
+static const QLatin1String SQL_ADD_ITEM ( "INSERT INTO history (artist,title,station,frequency,fromRds,time) "
+ "VALUES ( ?,?,?,?,?,? )" );
-const char* SQL_SELECT_ALL = "SELECT * FROM history ORDER BY id DESC";
-const char* SQL_SELECT_TAGGED = "SELECT * FROM history WHERE tagged=1";// ORDER BY id DESC";
+static const QLatin1String SQL_SELECT_ALL ( "SELECT * FROM history ORDER BY id DESC" );
+static const QLatin1String SQL_SELECT_TAGGED( "SELECT * FROM history WHERE tagged=1" );// ORDER BY id DESC";
-//const char* SQL_DELETE_ALL = "DELETE FROM history";
-const char* SQL_DELETE_RECENT = "DELETE FROM history WHERE tagged=0";
-//const char* SQL_DELETE_TAGGED = "DELETE FROM history WHERE tagged=1";
-const char* SQL_CLEAR_TAGS = "UPDATE history SET tagged = 0 WHERE tagged = 1";
+static const QLatin1String SQL_DELETE_ALL ( "DELETE FROM history" );
+static const QLatin1String SQL_DELETE_RECENT( "DELETE FROM history WHERE tagged=0" );
+//static const QLatin1String SQL_DELETE_TAGGED = "DELETE FROM history WHERE tagged=1";
+static const QLatin1String SQL_CLEAR_TAGS ( "UPDATE history SET tagged = 0 WHERE tagged = 1" );
-//static const char* SQL_FIND_ITEM_BY_ID = "SELECT * FROM history WHERE id = ?";
-const char* SQL_TOGGLE_TAG = "UPDATE history SET tagged = ? WHERE id = ?";
-
+//static static const QLatin1String SQL_FIND_ITEM_BY_ID( "SELECT * FROM history WHERE id = ?" );
+static const QLatin1String SQL_TOGGLE_TAG ( "UPDATE history SET tagged = ? WHERE id = ?" );
#ifdef LOGGING_ENABLED
# define GET_ERR( param ) GETSTRING( param.lastError().text() )
@@ -195,12 +194,27 @@
QStringList list;
if ( mShowDetails ) {
- list.append( qtTrId( "txt_rad_dblist_1_2" ).arg( artist ).arg( title ) );
- QDateTime dateTime = record.value( RadioHistoryValue::Time ).toDateTime();
- const QString time = dateTime.toLocalTime().toString();
+ QString formatter = qtTrId( "txt_rad_dblist_1_2" );
+ LOG_FORMAT( "---formatter--- %s", GETSTRING( formatter ) );
+ formatter = "%1 - %2"; // TODO!
+
+ const QString firstRow = QString( formatter ).arg( artist ).arg( title );
+ LOG_FORMAT( "---firstRow--- %s", GETSTRING( firstRow ) );
+ list.append( firstRow );
+
+ const uint timeInSecs = record.value( RadioHistoryValue::Time ).toUInt();
+ QDateTime dateTime;
+ dateTime.setTime_t( timeInSecs );
+
+ QString time = dateTime.toString( Qt::SystemLocaleShortDate );
+ LOG_FORMAT( "---time--- %s", GETSTRING( time ) );
QString name = !station.isEmpty() ? station : parseFrequency( frequency );
- list.append( qtTrId( "txt_rad_dblist_1_2" ).arg( time ).arg( name ) );
+ LOG_FORMAT( "---name--- %s", GETSTRING( name ) );
+ const QString secondRow = QString( formatter ).arg( time ).arg( name );
+ LOG_FORMAT( "---secondRow--- %s", GETSTRING( secondRow ) );
+
+ list.append( secondRow );
} else {
list.append( artist );
list.append( title );
@@ -233,7 +247,7 @@
QSqlQuery query = beginTransaction();
- query.prepare( removeTagged ? SQL_CLEAR_TAGS : SQL_DELETE_RECENT );
+ query.prepare( removeTagged ? SQL_CLEAR_TAGS : SQL_DELETE_ALL );
// Commented out because rowsRemoved() seems to crash HbListView
// commitTransaction( query, RemoveRows, 0, rowCount() - 1 );
@@ -253,7 +267,6 @@
mViewMode = mode;
mQueryModel->setQuery( mode == ShowTagged ? SQL_SELECT_TAGGED : SQL_SELECT_ALL, *mDatabase );
- q_ptr->reset();
}
/*!
@@ -267,7 +280,11 @@
updateQuery.addBindValue( item.isTagged() ? 0 : 1 );
updateQuery.addBindValue( item.id() );
- commitTransaction( updateQuery, ChangeData, row );
+ Operation operation = ChangeData;
+ if ( mViewMode == ShowTagged && item.isTagged() ) {
+ operation = RemoveRows;
+ }
+ commitTransaction( updateQuery, operation, row );
}
/*!
--- a/radioapp/radiouiengine/src/radiomonitorservice.cpp Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radiouiengine/src/radiomonitorservice.cpp Fri Jun 25 19:09:05 2010 +0300
@@ -17,6 +17,7 @@
// System includes
#include <QTimer>
+#include <QRegExp>
// User includes
#include "radiomonitorservice.h"
@@ -44,15 +45,15 @@
*
*/
RadioMonitorService::RadioMonitorService( RadioUiEnginePrivate& engine ) :
- XQServiceProvider( RADIO_MONITOR_SERVICE, &engine.api() ),
+ XQServiceProvider( RADIO_SERVICE +"."+ RADIO_MONITOR_SERVICE, &engine.api() ),
mUiEngine( engine ),
mRadioStatus( RadioStatus::UnSpecified ),
mNotificationTimer( new QTimer( this ) )
{
mNotificationTimer->setSingleShot( true );
mNotificationTimer->setInterval( NOTIFICATION_DELAY );
- Radio::connect( mNotificationTimer.data(), SIGNAL(timeout()),
- this, SLOT(sendNotifications()) );
+ Radio::connect( mNotificationTimer, SIGNAL(timeout()),
+ this, SLOT(sendNotifications()) );
publishAll();
}
@@ -125,7 +126,7 @@
notification.setValue( RadioNotificationData( RadioServiceNotification::FavoriteCount, stationModel.favoriteCount() ) );
notificationList.append( notification );
- notification.setValue( RadioNotificationData( RadioServiceNotification::Frequency, station.frequency() ) );
+ notification.setValue( RadioNotificationData( RadioServiceNotification::Frequency, RadioStation::parseFrequency( station.frequency() ) ) );
notificationList.append( notification );
if ( !station.name().isEmpty() ) {
@@ -140,7 +141,8 @@
}
if ( !station.radioText().isEmpty() ) {
- notification.setValue( RadioNotificationData( RadioServiceNotification::RadioText, station.radioText() ) );
+ const QString trimmedRadioText = trimHtmlTags( station.radioText() );
+ notification.setValue( RadioNotificationData( RadioServiceNotification::RadioText, trimmedRadioText ) );
notificationList.append( notification );
}
@@ -219,7 +221,8 @@
}
if ( station.hasDataChanged( RadioStation::RadioTextChanged ) ) {
- notification.setValue( RadioNotificationData( RadioServiceNotification::RadioText, station.radioText() ) );
+ const QString trimmedRadioText = trimHtmlTags( station.radioText() );
+ notification.setValue( RadioNotificationData( RadioServiceNotification::RadioText, trimmedRadioText ) );
list.append( notification );
}
@@ -243,7 +246,7 @@
{
Q_UNUSED( reason );
if ( !mUiEngine.api().isScanning() ) {
- RUN_NOTIFY( Frequency, frequency );
+ RUN_NOTIFY( Frequency, RadioStation::parseFrequency( frequency ) );
RadioStation station;
if ( mUiEngine.api().stationModel().findFrequency( frequency, station ) && !station.name().isEmpty() ) {
RUN_NOTIFY( Name, station.name() );
@@ -287,6 +290,18 @@
/*!
*
*/
+QString RadioMonitorService::trimHtmlTags( const QString& html )
+{
+ QString trimmed = html;
+ QRegExp rex( "<.+>" );
+ rex.setMinimal( true );
+ trimmed.remove( rex );
+ return trimmed;
+}
+
+/*!
+ *
+ */
void RadioMonitorService::notify( const QVariant& notification )
{
mNotificationTimer->stop();
--- a/radioapp/radiouiengine/src/radioscannerengine.cpp Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radiouiengine/src/radioscannerengine.cpp Fri Jun 25 19:09:05 2010 +0300
@@ -44,7 +44,6 @@
RadioScannerEngine::~RadioScannerEngine()
{
cancel();
- delete d_ptr;
}
/*!
--- a/radioapp/radiouiengine/src/radioscannerengine_p.cpp Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radiouiengine/src/radioscannerengine_p.cpp Fri Jun 25 19:09:05 2010 +0300
@@ -61,7 +61,10 @@
if ( reason == TuneReason::StationScanInitialization ) {
mUiEngine.wrapper().startSeeking( Seek::Up, TuneReason::StationScan );
} else if ( reason == TuneReason::StationScan ) {
- if ( frequency > mLastFoundFrequency ) {
+ if ( frequency == mLastFoundFrequency ) {
+ // Stop scanning
+ q->emitStationFound( RadioStation() );
+ } else if ( frequency > mLastFoundFrequency ) {
// Station has been found normally
mLastFoundFrequency = frequency;
addFrequencyAndReport( frequency );
--- a/radioapp/radiouiengine/src/radiostation.cpp Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radiouiengine/src/radiostation.cpp Fri Jun 25 19:09:05 2010 +0300
@@ -25,11 +25,8 @@
#include "radio_global.h"
// Constants
-const QString TAG_ARTIST = "artist";
-const QString TAG_TITLE = "title";
-const QString HTML_ARTIST = "<a href=\"" + TAG_ARTIST + "\">";
-const QString HTML_TITLE = "<a href=\"" + TAG_TITLE + "\">";
-const QString HTML_CLOSE = "</a>";
+const QLatin1String HTML_TAG_START( "<font color='cyan'><u>" );
+const QLatin1String HTML_TAG_END( "</u></font>" );
const uint LAST_CALLSIGN_CHAR_CODE = 25;
const uint THREE_LETTER_CALLSIGN_COUNT = 72;
@@ -64,10 +61,26 @@
const int PS_NAME_CHANGE_THRESHOLD_SECONDS = 10;
+// Macros to help protect shared null and manual station instances to help debugging
+// Enabled in emulator or win32 builds by default
+#if defined __WINS__ || defined BUILD_WIN32
+# define PROTECT_SHAREDNULL_AND_MANUALSTATION
+#endif
+
+#ifdef PROTECT_SHAREDNULL_AND_MANUALSTATION
+# define ASSERT_SHARED_NULL_IS_INTACT \
+ Q_ASSERT_X( mData->mPresetIndex != SharedNull, "RadioStation", "Shared null modified illegally!" );
+# define ASSERT_MANUAL_STATION \
+ Q_ASSERT_X( mData->mPresetIndex != ManualStation, "RadioStation", "Illegally modifying manual station" );
+#else
+# define ASSERT_SHARED_NULL_IS_INTACT
+# define ASSERT_MANUAL_STATION
+#endif // PROTECT_SHAREDNULL_AND_MANUALSTATION
+
/**
* Static shared data instance that is used by all default-constructed RadioStation instances
*/
-Q_GLOBAL_STATIC_WITH_ARGS( RadioStationPrivate, shared_null, ( RadioStation::SharedNull ) )
+static RadioStationPrivate shared_null( RadioStation::SharedNull, 0 );
/*!
*
@@ -83,29 +96,24 @@
*
*/
RadioStation::RadioStation() :
- QObject( 0 )
+ mData( &shared_null )
{
- mData = shared_null();
- mData->ref.ref();
}
/*!
*
*/
RadioStation::RadioStation( const RadioStation& other ) :
- QObject( 0 )
+ mData( other.mData )
{
- mData = other.mData;
- mData->ref.ref();
}
/*!
*
*/
RadioStation::RadioStation( int presetIndex, uint frequency ) :
- QObject( 0 )
+ mData( new RadioStationPrivate( presetIndex, frequency ) )
{
- mData = new RadioStationPrivate( presetIndex, frequency );
}
/*!
@@ -113,7 +121,6 @@
*/
RadioStation::~RadioStation()
{
- decrementReferenceCount();
}
/*!
@@ -121,7 +128,7 @@
*/
RadioStation& RadioStation::operator=( const RadioStation& other )
{
- qAtomicAssign( mData, other.mData );
+ mData = other.mData;
return *this;
}
@@ -130,9 +137,8 @@
*/
void RadioStation::reset()
{
- decrementReferenceCount();
- mData = shared_null();
- mData->ref.ref();
+ mData = &shared_null;
+ ASSERT_SHARED_NULL_IS_INTACT
}
/*!
@@ -141,7 +147,6 @@
void RadioStation::setChangeFlags( RadioStation::Change flags )
{
if ( mData->mChangeFlags != flags ) {
- detach();
mData->mChangeFlags = flags;
}
}
@@ -152,7 +157,7 @@
void RadioStation::setPresetIndex( int presetIndex )
{
if ( mData->mPresetIndex != presetIndex ) {
- detach();
+ ASSERT_MANUAL_STATION
mData->mPresetIndex = presetIndex;
mData->mChangeFlags |= RadioStation::PersistentDataChanged;
}
@@ -164,9 +169,9 @@
void RadioStation::setFrequency( uint frequency )
{
if ( mData->mFrequency != frequency ) {
- detach();
mData->mFrequency = frequency;
mData->mChangeFlags |= RadioStation::PersistentDataChanged;
+ ASSERT_SHARED_NULL_IS_INTACT
}
}
@@ -178,7 +183,6 @@
// Name emptiness is checked because this name setter is used by incoming RDS PS name
// and empty names should be ignored
if ( !name.isEmpty() && !mData->mRenamedByUser && mData->mName.compare( name ) != 0 ) {
- detach();
mData->mName = name.trimmed();
mData->mChangeFlags |= RadioStation::PersistentDataChanged | RadioStation::NameChanged;
@@ -198,11 +202,13 @@
//TODO: This is a temporary thing to see some URL. Remove this
if ( !mData->mName.isEmpty() ) {
- mData->mUrl = "<a href=\"buu\">www." + mData->mName.toLower() + ".fi</a>";
+ QString url = mData->mName.toLower().remove( " " );
+ mData->mUrl = "www." + url + ".fi";
} else {
mData->mUrl = "";
}
mData->mChangeFlags |= RadioStation::UrlChanged;
+ ASSERT_SHARED_NULL_IS_INTACT
}
}
@@ -212,9 +218,9 @@
void RadioStation::setGenre( const int genre )
{
if ( mData->mGenre != genre ) {
- detach();
mData->mGenre = genre;
mData->mChangeFlags |= RadioStation::PersistentDataChanged | RadioStation::GenreChanged;
+ ASSERT_SHARED_NULL_IS_INTACT
}
}
@@ -224,9 +230,9 @@
void RadioStation::setUrl( const QString& url )
{
if ( mData->mUrl.compare( url ) != 0 ) {
- detach();
mData->mUrl = url;
mData->mChangeFlags |= RadioStation::PersistentDataChanged | RadioStation::UrlChanged;
+ ASSERT_SHARED_NULL_IS_INTACT
}
}
@@ -238,40 +244,33 @@
{
LOG_FORMAT( "RadioStation::setPiCode new PI: %d", piCode );
// toggling local area coverage bit code must not be interpreted as new PI code
- if( region != RadioRegion::America )
- {
+ if ( region != RadioRegion::America ) {
piCode &= ~DISABLE_LOCAL_AREA_COVERAGE_MASK;
}
LOG_FORMAT( "stored PI: %d", mData->mPiCode );
LOG_FORMAT( "call sign check done: %d", mData->mCallSignCheckDone );
//prevent executing the below code when unnessesary
- if ( mData->mPiCode != piCode || !mData->mCallSignCheckDone )
- {
- detach();
+ if ( mData->mPiCode != piCode || !mData->mCallSignCheckDone ) {
mData->mPiCode = piCode;
mData->mChangeFlags |= RadioStation::PersistentDataChanged | RadioStation::PiCodeChanged;
// call sign not calculated for clear channel stations
//TODO: Remove magic numbers
- if( ( (mData->mPiCode & 0xF000 ) >> 12 ) == 0x1 )
- {
+ if ( ( (mData->mPiCode & 0xF000 ) >> 12 ) == 0x1 ) {
LOG( "Clear channel station" );
mData->mCallSignCheckDone = true;
- }
- // if America region, not PS name received and not user renamed station
- else if ( region == RadioRegion::America && mData->mName.isEmpty() && !isRenamed() )
- {
+ } else if ( region == RadioRegion::America && mData->mName.isEmpty() && !isRenamed() ) {
LOG( "Calculate call sign" );
mData->mName = piCodeToCallSign( mData->mPiCode );
mData->mChangeFlags |= RadioStation::NameChanged;
}
- if ( mData->mChangeFlags.testFlag( RadioStation::PsTypeChanged ) )
- {
+ if ( mData->mChangeFlags.testFlag( RadioStation::PsTypeChanged ) ) {
LOG( "Call sign check done" );
mData->mCallSignCheckDone = true;
}
+ ASSERT_SHARED_NULL_IS_INTACT
return true;
}
return false;
@@ -283,9 +282,9 @@
void RadioStation::setPsType( PsType psType )
{
if ( mData->mPsType != psType ) {
- detach();
mData->mPsType = psType;
mData->mChangeFlags |= RadioStation::PsTypeChanged;
+ ASSERT_SHARED_NULL_IS_INTACT
}
}
@@ -295,9 +294,9 @@
void RadioStation::setRadioText( const QString& radioText )
{
if ( mData->mRadioText.compare( radioText ) != 0 ) {
- detach();
mData->mRadioText = radioText.isEmpty() ? "" : radioText.trimmed();
mData->mChangeFlags |= RadioStation::RadioTextChanged;
+ ASSERT_SHARED_NULL_IS_INTACT
}
}
@@ -316,14 +315,7 @@
return;
}
- detach();
- QString replacement = "";
- if ( rtPlusClass == RtPlus::Artist ) {
- replacement = HTML_ARTIST;
- } else if ( rtPlusClass == RtPlus::Title ) {
- replacement = HTML_TITLE;
- }
- replacement += rtPlusItem + HTML_CLOSE;
+ const QString replacement = HTML_TAG_START + rtPlusItem + HTML_TAG_END;
mData->mRadioText.replace( rtPlusItem, replacement );
mData->mChangeFlags |= RadioStation::RadioTextChanged;
@@ -336,9 +328,9 @@
void RadioStation::setDynamicPsText( const QString& dynamicPsText )
{
if ( mData->mDynamicPsText.compare( dynamicPsText ) != 0 ) {
- detach();
mData->mDynamicPsText = dynamicPsText;
mData->mChangeFlags |= RadioStation::DynamicPsChanged;
+ ASSERT_SHARED_NULL_IS_INTACT
}
}
@@ -347,7 +339,7 @@
*/
bool RadioStation::isValid() const
{
- return mData->mPresetIndex >= 0 && mData->mFrequency > 0;
+ return mData->mFrequency > 0 && ( isType( ManualStation ) || mData->mPresetIndex >= 0 );
}
/*!
@@ -366,7 +358,6 @@
// We don't check for name emptiness because this setter is used also to remove the renaming
// of a station by setting an empty name
if ( mData->mName.compare( name ) != 0 ) {
- detach();
mData->mName = name;
mData->mRenamedByUser = !name.isEmpty();
mData->mChangeFlags |= RadioStation::PersistentDataChanged | RadioStation::NameChanged;
@@ -392,20 +383,9 @@
/*!
*
*/
-QString RadioStation::frequencyMhz() const
+QString RadioStation::frequencyString() const
{
- return qtTrId( "txt_rad_list_l1_mhz_big" ).arg( parseFrequency( mData->mFrequency ) );
-}
-
-/*!
- *
- */
-QString RadioStation::nameOrFrequencyMhz() const
-{
- if ( !mData->mName.isEmpty() ) {
- return mData->mName;
- }
- return frequencyMhz();
+ return parseFrequency( mData->mFrequency );
}
/*!
@@ -430,9 +410,9 @@
void RadioStation::setFavorite( bool favorite )
{
if ( isFavorite() != favorite ) {
- detach();
favorite ? setType( RadioStation::Favorite ) : unsetType( RadioStation::Favorite );
mData->mChangeFlags |= RadioStation::PersistentDataChanged | RadioStation::FavoriteChanged;
+ ASSERT_SHARED_NULL_IS_INTACT
}
}
@@ -455,21 +435,9 @@
/*!
*
*/
-bool RadioStation::hasPiCode() const
+int RadioStation::piCode() const
{
- return mData->mPiCode != -1;
-}
-
-/*!
- *
- */
-bool RadioStation::hasRds() const
-{
- return hasPiCode() ||
- mData->mGenre != -1 ||
- !mData->mDynamicPsText.isEmpty() ||
- !mData->mRadioText.isEmpty() ||
- ( !mData->mName.isEmpty() && !isRenamed() );
+ return mData->mPiCode;
}
/*!
@@ -478,7 +446,6 @@
void RadioStation::setType( RadioStation::Type type )
{
if ( !isType( type ) ) {
- detach();
// Check if favorite-status changed
if ( mData->mType.testFlag( RadioStation::Favorite ) != type.testFlag( RadioStation::Favorite ) ) {
@@ -487,6 +454,7 @@
mData->mType |= type;
mData->mChangeFlags |= RadioStation::PersistentDataChanged | RadioStation::TypeChanged;
+ ASSERT_SHARED_NULL_IS_INTACT
}
}
@@ -496,7 +464,6 @@
void RadioStation::unsetType( RadioStation::Type type )
{
if ( isType( type ) ) {
- detach();
// Check if favorite-status changed
if ( mData->mType.testFlag( RadioStation::Favorite ) != type.testFlag( RadioStation::Favorite ) ) {
@@ -505,6 +472,7 @@
mData->mType &= ~type;
mData->mChangeFlags |= RadioStation::PersistentDataChanged | RadioStation::TypeChanged;
+ ASSERT_SHARED_NULL_IS_INTACT
}
}
@@ -570,22 +538,10 @@
void RadioStation::resetChangeFlags()
{
if ( mData->mChangeFlags != RadioStation::NoChange ) {
- detach();
mData->mChangeFlags = RadioStation::NoChange;
}
}
-/**
- * Decrements the reference count of the implicitly shared data.
- */
-void RadioStation::decrementReferenceCount()
-{
- if ( !mData->ref.deref() ) {
- delete mData;
- mData = 0;
- }
-}
-
/*!
*
*/
@@ -595,21 +551,19 @@
LOG_FORMAT( "RadioStation::piCodeToCallSign PI: %d", programmeIdentification );
// call signs beginning with 'K'
- if( ( programmeIdentification>=KXXX_CALLSIGN_PI_FIRST ) && ( programmeIdentification < WXXX_CALLSIGN_PI_FIRST ) ) {
+ if ( ( programmeIdentification>=KXXX_CALLSIGN_PI_FIRST ) && ( programmeIdentification < WXXX_CALLSIGN_PI_FIRST ) ) {
callSign += "K";
callSign += iterateCallSign( KXXX_CALLSIGN_PI_FIRST, programmeIdentification );
}
// call signs beginning with 'W'
- else if (( programmeIdentification >= WXXX_CALLSIGN_PI_FIRST ) && ( programmeIdentification <= WXXX_CALLSIGN_PI_LAST )) {
+ else if ( ( programmeIdentification >= WXXX_CALLSIGN_PI_FIRST ) && ( programmeIdentification <= WXXX_CALLSIGN_PI_LAST ) ) {
callSign += "W";
callSign += iterateCallSign( WXXX_CALLSIGN_PI_FIRST, programmeIdentification );
}
// 3 letter only call signs
- else if(( programmeIdentification >= XXX_CALLSIGN_PI_FIRST ) && ( programmeIdentification <= XXX_CALLSIGN_PI_LAST)) {
+ else if ( ( programmeIdentification >= XXX_CALLSIGN_PI_FIRST ) && ( programmeIdentification <= XXX_CALLSIGN_PI_LAST ) ) {
callSign += callSignString( programmeIdentification );
- }
- else
- {
+ } else {
LOG( "RadioStation::piCodeToCallSign - Unhandled else" );
}
@@ -626,10 +580,10 @@
QString callSign;
LOG_FORMAT( "RadioStation::iterateCallSign base: %d", piBase );
- int sum(0), i(0);
-
+ int sum = 0;
+ int i = 0;
while( sum < programmeIdentification ) {
- i++;
+ ++i;
sum = piBase + i * 676 + 0 + 0;
}
callSign += callSignChar( i - 1 );
@@ -638,7 +592,7 @@
sum -= 676;
i = 0;
while( sum <= programmeIdentification ) {
- i++;
+ ++i;
sum = tmpSum + 0 + i * 26 + 0;
}
callSign += callSignChar( i - 1 );
@@ -647,7 +601,7 @@
sum -= 26;
i = 0;
while( sum <= programmeIdentification ) {
- i++;
+ ++i;
sum = tmpSum + 0 + 0 + i;
}
callSign += callSignChar( i - 1 );
@@ -668,7 +622,7 @@
LOG_FORMAT( "RadioStation::callSignString, Not found PI: %d", programmeIdentification );
- return QString("????");
+ return QString( "????" );
}
/*!
@@ -684,30 +638,6 @@
}
/**
- * Detach from the implicitly shared data
- */
-void RadioStation::detach()
-{
- if ( !isDetached() ) {
- RadioStationPrivate* newData = new RadioStationPrivate( *mData );
-
- decrementReferenceCount();
-
- newData->ref = 1;
- mData = newData;
-
- // The shared null instance of the data has its preset index set to -200 (RadioStation::SharedNull).
- // We change the preset index of the detached data to -100 (RadioStation::Invalid) just to ease
- // debugging. This guarantees that the only instance that has value -200 is the actual shared null.
- #ifdef _DEBUG
- if ( mData->mPresetIndex == RadioStation::SharedNull ) {
- mData->mPresetIndex = RadioStation::Invalid;
- }
- #endif
- }
-}
-
-/**
* Checks if the class is detached from implicitly shared data
*/
bool RadioStation::isDetached() const
--- a/radioapp/radiouiengine/src/radiostation_p.cpp Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radiouiengine/src/radiostation_p.cpp Fri Jun 25 19:09:05 2010 +0300
@@ -26,14 +26,36 @@
RadioStationPrivate::RadioStationPrivate( int presetIndex, uint frequency )
{
init( presetIndex, frequency );
+
+ if ( presetIndex == RadioStation::SharedNull ) {
+ ref = 2;
+ }
}
/*!
*
*/
-RadioStationPrivate::RadioStationPrivate( RadioStation::PresetFlag flag )
+RadioStationPrivate::RadioStationPrivate( const RadioStationPrivate& other ) :
+ QSharedData( other ),
+ mPresetIndex( other.mPresetIndex ),
+ mFrequency( other.mFrequency ),
+ mName( other.mName ),
+ mRenamedByUser( other.mRenamedByUser ),
+ mGenre( other.mGenre ),
+ mUrl( other.mUrl ),
+ mPiCode( other.mPiCode ),
+ mType( other.mType ),
+ mPsType( other.mPsType ),
+ mRadioText( other.mRadioText ),
+ mDynamicPsText( other.mDynamicPsText ),
+ mChangeFlags( other.mChangeFlags ),
+ mCallSignCheckDone( other.mCallSignCheckDone ),
+ mLastPsNameChangeTime( other.mLastPsNameChangeTime )
{
- init( flag );
+ // Protect the shared null preset index to make debugging easier
+ if ( mPresetIndex == RadioStation::SharedNull ) {
+ mPresetIndex = RadioStation::Invalid;
+ }
}
/*!
@@ -48,9 +70,8 @@
*/
void RadioStationPrivate::init( int presetIndex, uint frequency )
{
- ref = 1;
+ mPresetIndex = presetIndex;
mFrequency = frequency;
- mPresetIndex = presetIndex;
mRenamedByUser = false;
mGenre = -1;
mPiCode = -1;
--- a/radioapp/radiouiengine/src/radiostationmodel.cpp Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radiouiengine/src/radiostationmodel.cpp Fri Jun 25 19:09:05 2010 +0300
@@ -63,7 +63,6 @@
*/
RadioStationModel::~RadioStationModel()
{
- delete d_ptr;
}
/*!
@@ -171,19 +170,19 @@
d->mWrapper = wrapper;
int index = d->mPresetStorage->firstPreset();
- LOG_FORMAT( "RadioStationModelPrivate::initialize: presetCount: %d, firstIndex: %d",
+ LOG_FORMAT( "RadioStationModel::initialize: presetCount: %d, firstIndex: %d",
d->mPresetStorage->presetCount(), index );
while ( index >= 0 ) {
RadioStation station;
- station.detach();
- RadioStationIf* preset = static_cast<RadioStationIf*>( station.data_ptr() );
- if ( d->mPresetStorage->readPreset( index, *preset ) ) {
- if ( station.isValid() ) {
+ RadioStationIf* stationInterface = static_cast<RadioStationIf*>( station.data_ptr() );
+ if ( d->mPresetStorage->readPreset( index, *stationInterface ) ) {
+ if ( station.isValid() && d->mWrapper->isFrequencyValid( station.frequency() ) ) {
d->mStations.insert( station.frequency(), station );
} else {
- LOG( "RadioStationModelPrivate::initialize: Invalid station!" );
+ LOG( "RadioStationModel::initialize: Invalid station!" );
+ LOG_FORMAT( "Invalid station freq: %d", station.frequency() );
}
}
@@ -241,9 +240,15 @@
/*!
* Finds a station by frequency
*/
-bool RadioStationModel::findFrequency( uint frequency, RadioStation& station ) const
+bool RadioStationModel::findFrequency( uint frequency, RadioStation& station, FindCriteria::Criteria criteria ) const
{
Q_D( const RadioStationModel );
+
+ if ( criteria == FindCriteria::IncludeManualStation && d->mCurrentStation->frequency() == frequency ) {
+ station = *d->mCurrentStation;
+ return true;
+ }
+
if ( d->mStations.contains( frequency ) ) {
station = d->mStations.value( frequency );
return true;
@@ -252,6 +257,16 @@
}
/*!
+ * Convenience function to find a radio station.
+ */
+RadioStation RadioStationModel::findStation( uint frequency, FindCriteria::Criteria criteria ) const
+{
+ RadioStation station;
+ findFrequency( frequency, station, criteria ); // Return value ignored
+ return station;
+}
+
+/*!
* Finds a station by preset index
*/
int RadioStationModel::findPresetIndex( int presetIndex )
@@ -434,11 +449,11 @@
{
Q_D( RadioStationModel );
const int newIndex = findUnusedPresetIndex();
- LOG_FORMAT( "RadioStationModelPrivate::addStation: Adding station to index %d", newIndex );
+ LOG_FORMAT( "RadioStationModel::addStation: Adding station to index %d", newIndex );
RadioStation newStation = station;
newStation.setPresetIndex( newIndex );
- newStation.unsetType( RadioStation::Temporary );
+ newStation.unsetType( RadioStation::ManualStation );
// We have to call beginInsertRows() BEFORE the addition is actually done so we must figure out where
// the new station will go in the sorted frequency order
@@ -458,7 +473,6 @@
}
}
-// emit layoutAboutToBeChanged();
beginInsertRows( QModelIndex(), row, row );
d->doSaveStation( newStation );
@@ -467,7 +481,10 @@
endInsertRows();
-// emit layoutChanged();
+ // Not all UI components listen to rowsInserted() signal so emit the favorite signal
+ if ( newStation.isFavorite() ) {
+ emit favoriteChanged( *d->mCurrentStation );
+ }
}
/*!
@@ -480,8 +497,9 @@
RadioStation::Change changeFlags = station.changeFlags();
station.resetChangeFlags();
- if ( station.isType( RadioStation::Temporary ) ) {
+ if ( station.isType( RadioStation::ManualStation ) ) {
+ d->mManualStation = station;
emitChangeSignals( station, changeFlags );
} else if ( station.isValid() && stationHasChanged && d->mStations.contains( station.frequency() )) {
@@ -510,7 +528,7 @@
{
Q_D( RadioStationModel );
if ( d->mWrapper->isFrequencyValid( frequency ) ) {
- LOG_FORMAT( "RadioStationModelPrivate::setFavoriteByFrequency, frequency: %d", frequency );
+ LOG_FORMAT( "RadioStationModel::setFavoriteByFrequency, frequency: %d", frequency );
RadioStation station;
if ( findFrequency( frequency, station ) ) { // Update existing preset
if ( station.isFavorite() != favorite ) {
@@ -528,11 +546,6 @@
newStation.setType( RadioStation::LocalStation | RadioStation::Favorite );
- // If PI code has been received, it is a local station
- if ( newStation.hasPiCode() ) {
- newStation.setType( RadioStation::LocalStation );
- }
-
// Emit the signals only after adding the preset and reinitializing the current station
// because the UI will probably query the current station in its slots that get called.
addStation( newStation );
@@ -545,7 +558,7 @@
*/
void RadioStationModel::setFavoriteByPreset( int presetIndex, bool favorite )
{
- LOG_FORMAT( "RadioStationModelPrivate::setFavoriteByPreset, presetIndex: %d", presetIndex );
+ LOG_FORMAT( "RadioStationModel::setFavoriteByPreset, presetIndex: %d", presetIndex );
RadioStation station;
if ( findPresetIndex( presetIndex, station ) != RadioStation::NotFound ) {
station.setFavorite( favorite );
@@ -558,7 +571,7 @@
*/
void RadioStationModel::renameStation( int presetIndex, const QString& name )
{
- LOG_FORMAT( "RadioStationModelPrivate::renameStation, presetIndex: %d, name: %s", presetIndex, GETSTRING(name) );
+ LOG_FORMAT( "RadioStationModel::renameStation, presetIndex: %d, name: %s", presetIndex, GETSTRING(name) );
RadioStation station;
if ( findPresetIndex( presetIndex, station ) != RadioStation::NotFound ) {
station.setUserDefinedName( name );
@@ -715,21 +728,6 @@
// Nothing to do here
}
- LOG_FORMAT( "RadioStationModelPrivate::findUnusedPresetIndex, index: %d", index );
+ LOG_FORMAT( "RadioStationModel::findUnusedPresetIndex, index: %d", index );
return index;
}
-
-/*!
- * Used by the RDS data setters to find the correct station where the data is set
- */
-RadioStation RadioStationModel::findCurrentStation( uint frequency )
-{
- Q_D( RadioStationModel );
- RadioStation station = *d->mCurrentStation;
- if ( station.frequency() != frequency ) {
- if ( !findFrequency( frequency, station ) ) {
- return RadioStation();
- }
- }
- return station;
-}
--- a/radioapp/radiouiengine/src/radiostationmodel_p.cpp Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radiouiengine/src/radiostationmodel_p.cpp Fri Jun 25 19:09:05 2010 +0300
@@ -46,6 +46,7 @@
mCurrentStation( &mManualStation ),
mDynamicPsTimer( new QTimer() )
{
+ mManualStation.setType( RadioStation::ManualStation );
Radio::connect( mDynamicPsTimer.data(), SIGNAL(timeout()),
q_ptr, SLOT(dynamicPsCheckEnded()) );
mDynamicPsTimer->setInterval( DYNAMIC_PS_CHECK_TIMEOUT );
@@ -89,6 +90,7 @@
mCurrentStation = &mStations[ frequency ];
} else {
mManualStation.reset();
+ mManualStation.setType( RadioStation::ManualStation );
mManualStation.setFrequency( frequency );
mCurrentStation = &mManualStation;
}
@@ -107,7 +109,7 @@
void RadioStationModelPrivate::setCurrentGenre( uint frequency, int genre )
{
Q_Q( RadioStationModel );
- RadioStation station = q->findCurrentStation( frequency );
+ RadioStation station = q->findStation( frequency, FindCriteria::IncludeManualStation );
if ( !station.isValid() ) {
LOG( "Unable to find current station. Ignoring RDS" );
return;
@@ -191,7 +193,7 @@
{
Q_Q( RadioStationModel );
LOG_FORMAT( "void RadioStationModelPrivate::setCurrentPsName: %s", GETSTRING( name ) );
- RadioStation station = q->findCurrentStation( frequency );
+ RadioStation station = q->findStation( frequency, FindCriteria::IncludeManualStation );
if ( !station.isValid() ) {
LOG( "Unable to find current station. Ignoring RDS" );
return;
@@ -252,7 +254,7 @@
void RadioStationModelPrivate::setCurrentRadioText( uint frequency, const QString& radioText )
{
Q_Q( RadioStationModel );
- RadioStation station = q->findCurrentStation( frequency );
+ RadioStation station = q->findStation( frequency, FindCriteria::IncludeManualStation );
if ( !station.isValid() ) {
LOG( "Unable to find current station. Ignoring RDS" );
return;
@@ -269,7 +271,7 @@
void RadioStationModelPrivate::setCurrentRadioTextPlus( uint frequency, int rtClass, const QString& rtItem )
{
Q_Q( RadioStationModel );
- RadioStation station = q->findCurrentStation( frequency );
+ RadioStation station = q->findStation( frequency, FindCriteria::IncludeManualStation );
if ( !station.isValid() ) {
LOG( "Unable to find current station. Ignoring RDS" );
return;
@@ -286,7 +288,7 @@
void RadioStationModelPrivate::setCurrentPiCode( uint frequency, int piCode )
{
Q_Q( RadioStationModel );
- RadioStation station = q->findCurrentStation( frequency );
+ RadioStation station = q->findStation( frequency, FindCriteria::IncludeManualStation );
if ( !station.isValid() ) {
LOG( "Unable to find current station. Ignoring RDS" );
return;
--- a/radioapp/radiouiengine/src/radiouiengine.cpp Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radiouiengine/src/radiouiengine.cpp Fri Jun 25 19:09:05 2010 +0300
@@ -20,6 +20,8 @@
#include <QProcess>
#include <QFile>
#include <QTimer>
+#include <QDesktopServices>
+#include <QUrl>
#ifdef BUILD_WIN32
# include <QSettings>
@@ -40,30 +42,43 @@
#include "radiologger.h"
// Constants
-const uint DEFAULT_MIN_FREQUENCY = 87500000;
const uint RADIO_CENREP_UID = 0x2002FF52;
const uint RADIO_CENREP_FREQUENCY_KEY = 0x207;
+const uint RADIO_CENREP_HEADSET_VOLUME = 0x200;
+const QLatin1String OVI_STORE_URL( "http://www.music.nokia.co.uk/Touch/Search.aspx?artistsearch=#artist#&titlesearch=#title#" );
+const QLatin1String OTHER_STORE_URL( "http://www.amazon.com/gp/search/ref=sr_adv_m_digital/?search-alias=digital-music&field-author=#artist#&field-title=#title#" );
+const QLatin1String OTHER_STORE_ARTIST_TAG( "#artist#" );
+const QLatin1String OTHER_STORE_TITLE_TAG( "#title#" );
+const char WHITESPACE = ' ';
+const char WHITESPACE_REPLACEMENT = '+';
+
+// Constants used when launching radio server
+const QLatin1String RADIO_SERVER_NAME( "radioserver.exe" );
+const QLatin1String RADIO_RANGE_USEURO( "useuro" );
+const QLatin1String RADIO_RANGE_JAPAN( "japan" );
+
+// ====== STATIC FUNCTIONS ========
/*!
- *
+ * Gets the last tuned frequency from central repository
*/
-uint RadioUiEngine::lastTunedFrequency()
+uint RadioUiEngine::lastTunedFrequency( uint defaultFrequency )
{
- uint frequency = DEFAULT_MIN_FREQUENCY;
+ uint frequency = defaultFrequency;
#ifdef BUILD_WIN32
QScopedPointer<QSettings> settings( new QSettings( "Nokia", "QtFmRadio" ) );
frequency = settings->value( "CurrentFreq", DEFAULT_MIN_FREQUENCY ).toUInt();
if ( frequency == 0 ) {
- frequency = DEFAULT_MIN_FREQUENCY;
+ frequency = defaultFrequency;
}
#else
QScopedPointer<XQSettingsManager> settings( new XQSettingsManager() );
XQSettingsKey key( XQSettingsKey::TargetCentralRepository, RADIO_CENREP_UID, RADIO_CENREP_FREQUENCY_KEY );
frequency = settings->readItemValue( key, XQSettingsManager::TypeInt ).toUInt();
if ( frequency == 0 ) {
- frequency = DEFAULT_MIN_FREQUENCY;
+ frequency = defaultFrequency;
}
#endif
@@ -71,6 +86,42 @@
}
/*!
+ * Gets the last used volume level
+ */
+int RadioUiEngine::lastVolume()
+{
+ int volume = DEFAULT_VOLUME_LEVEL;
+
+#ifndef BUILD_WIN32
+ QScopedPointer<XQSettingsManager> settings( new XQSettingsManager() );
+ XQSettingsKey key( XQSettingsKey::TargetCentralRepository, RADIO_CENREP_UID, RADIO_CENREP_HEADSET_VOLUME );
+ volume = settings->readItemValue( key, XQSettingsManager::TypeInt ).toInt();
+ if ( volume == 0 ) {
+ volume = DEFAULT_VOLUME_LEVEL;
+ }
+#endif
+
+ return volume;
+}
+
+/*!
+ * Launches the radio server process
+ */
+void RadioUiEngine::launchRadioServer()
+{
+ QStringList args;
+ args << RADIO_RANGE_USEURO; //TODO: Determine current region
+ args << QString::number( lastTunedFrequency( 0 ) );
+ args << QString::number( lastVolume() );
+
+ QProcess serverProcess;
+ bool success = serverProcess.startDetached( RADIO_SERVER_NAME, args );
+ LOG_ASSERT( success, LOG( "Failed to start radio server!" ) );
+}
+
+// ====== MEMBER FUNCTIONS ========
+
+/*!
*
*/
RadioUiEngine::RadioUiEngine( QObject* parent ) :
@@ -84,7 +135,6 @@
*/
RadioUiEngine::~RadioUiEngine()
{
- delete d_ptr;
}
/*!
@@ -196,15 +246,22 @@
}
/*!
- *
+ * Creates a scanner engine and returns a pointer to it
+ * The returned pointer is wrapped inside a QScopedPointer to ensure this won't
+ * leak memory. The returned engine will be deleted even if the caller ignored
+ * the return value.
*/
-RadioScannerEngine* RadioUiEngine::createScannerEngine()
+RadioScannerEnginePtr RadioUiEngine::createScannerEngine()
{
Q_D( RadioUiEngine );
- if ( !d->mScannerEngine ) {
- d->mScannerEngine = new RadioScannerEngine( *d );
- }
- return d->mScannerEngine;
+#if defined BUILD_WIN32 || defined __WINS__
+ Q_ASSERT_X( !d->mScannerEngine, "RadioUiEngine::createScannerEngine", "Previous scanner instance not freed" );
+#endif
+
+ RadioScannerEnginePtr enginePtr( new RadioScannerEngine( *d ) );
+ d->mScannerEngine = enginePtr;
+
+ return enginePtr;
}
/*!
@@ -232,7 +289,7 @@
{
Q_D( const RadioUiEngine );
if ( d->mScannerEngine ) {
- return d->mScannerEngine->isScanning();
+ return d->mScannerEngine.data()->isScanning();
}
return false;
}
@@ -367,9 +424,24 @@
*/
void RadioUiEngine::openMusicStore( const RadioHistoryItem& item, MusicStore store )
{
- Q_UNUSED( item );
- Q_UNUSED( store );
- //TODO: Integrate to music store
+ QString artist = item.artist();
+ artist.replace( WHITESPACE, WHITESPACE_REPLACEMENT );
+ QString title = item.title();
+ title.replace( WHITESPACE, WHITESPACE_REPLACEMENT );
+
+ QString url = store == OviStore ? OVI_STORE_URL : OTHER_STORE_URL;
+ url.replace( OTHER_STORE_ARTIST_TAG, artist );
+ url.replace( OTHER_STORE_TITLE_TAG, title );
+
+ launchBrowser( url );
+}
+
+/*!
+ *
+ */
+void RadioUiEngine::launchBrowser( const QString& url )
+{
+ QDesktopServices::openUrl( QUrl( url ) );
}
/*!
--- a/radioapp/radiouiengine/src/radiouiengine_p.cpp Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radiouiengine/src/radiouiengine_p.cpp Fri Jun 25 19:09:05 2010 +0300
@@ -46,7 +46,8 @@
*
*/
RadioUiEnginePrivate::RadioUiEnginePrivate( RadioUiEngine* engine ) :
- q_ptr( engine )
+ q_ptr( engine ),
+ mPowerOffTimer( NULL )
{
}
@@ -60,7 +61,7 @@
XQPublishAndSubscribeUtils utils( settingsManager );
XQPublishAndSubscribeSettingsKey radioStartupKey( KRadioPSUid, KRadioStartupKey );
bool deleted = utils.deleteProperty( radioStartupKey );
- LOG_ASSERT( deleted, LOG( "RadioUiEnginePrivate::~RadioUiEnginePrivate(). Failed to delete P&S key" ) );
+ LOG_ASSERT( deleted, LOG( "RadioUiEnginePrivate::~RadioUiEnginePrivate(). Failed to remove P&S key" ) );
#endif
}
--- a/radioapp/radiouiengine/tsrc/t_radiouiengine.pro Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radiouiengine/tsrc/t_radiouiengine.pro Fri Jun 25 19:09:05 2010 +0300
@@ -22,6 +22,7 @@
symbian: {
TARGET.CAPABILITY = CAP_GENERAL_DLL
TARGET.SID = 0x101FF976 # Old visual radio uid
+ MMP_RULES += SMPSAFE
}
--- a/radioapp/radiowidgets/inc/radiocarouselitem.h Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radiowidgets/inc/radiocarouselitem.h Fri Jun 25 19:09:05 2010 +0300
@@ -26,74 +26,106 @@
// Forward declarations
class RadioStation;
-class RadioFadingLabel;
-class HbPushButton;
-class RadioStation;
-class HbAnchorLayout;
-class RadioStationCarousel;
+class HbIconItem;
+class HbTextItem;
+class HbRichTextItem;
+class HbTouchArea;
+class RadioCarouselItemObserver;
// Class declaration
class RadioCarouselItem : public HbWidget
{
- friend class RadioStationCarousel;
+ Q_OBJECT
+ Q_PROPERTY(Appearance appearance READ appearance WRITE setAppearance)
+ Q_ENUMS(Appearance)
- class Data;
+ friend class RadioStationCarousel;
public:
- RadioCarouselItem( RadioStationCarousel& carousel );
+ enum ItemFlag
+ {
+ NameVisible = 1 << 0,
+ FavoriteVisible = 1 << 1,
+ FavoriteTouchable = 1 << 2,
+ GenreVisible = 1 << 3,
+ RadiotextVisible = 1 << 4,
+ RadiotextTouchable = 1 << 5,
+ UrlVisible = 1 << 6,
+ UrlTouchable = 1 << 7,
+
+ LastFlagMarker = 1 << 8, // Keep this as the last flag
+
+ DefaultFlags = NameVisible | FavoriteVisible | FavoriteTouchable | GenreVisible | RadiotextVisible,
+ ManualSeekFlags = NameVisible
+ };
+ Q_DECLARE_FLAGS( CarouselItemFlags, ItemFlag )
+
+ enum Appearance { Default, Full, ManualSeek };
+
+ RadioCarouselItem( RadioCarouselItemObserver& observer, QGraphicsItem* parent, bool registerCss = false );
~RadioCarouselItem();
// New functions
- void setStation( const RadioStation& station );
+ void setAppearance( Appearance appearance );
+ Appearance appearance() const;
- void swapData( RadioCarouselItem& other );
+ void setSeekLayout( bool seekLayout );
+
+ void setStation( const RadioStation& station );
uint frequency() const;
void update( const RadioStation* station = NULL );
void setFrequency( uint frequency );
void cleanRdsData();
- void handleLongPress( const QPointF& coords );
void setRadioText( const QString& text );
- void setSeekLayout( bool seekLayout );
-
enum ItemVisibility{ AllVisible, AllHidden, IconVisible };
void setItemVisibility( ItemVisibility visibility );
void setIconOpacity( qreal opacity );
+ void createPrimitives();
+
+ void drawOffScreen( QPainter& painter );
+
+public slots:
+
+ void updatePrimitives();
+
private:
+ void gestureEvent( QGestureEvent* event );
+
+ void setFlags( CarouselItemFlags flags );
+ void clearFlags( CarouselItemFlags flags );
+
+ void updateVisibilities();
+
void updateFavoriteIcon( bool isFavorite );
- QString parseFrequency( const uint frequency );
- QString nameOrFrequency( const RadioStation& station, uint frequency = 0 );
+ void updateLayout();
private: // data
- class Data
- {
- public:
- Data();
- ~Data();
+ RadioCarouselItemObserver& mObserver;
+
+ QScopedPointer<RadioStation> mStation;
- QScopedPointer<RadioStation> mStation;
- HbAnchorLayout* mLayout;
- QScopedPointer<RadioFadingLabel> mNameLabel;
- QScopedPointer<HbPushButton> mIconButton;
- QScopedPointer<RadioFadingLabel> mGenreLabel;
- QScopedPointer<RadioFadingLabel> mRadiotextLabel;
- QScopedPointer<RadioFadingLabel> mUrlLabel;
- bool mSeekLayout;
+ HbIconItem* mFavoriteItem;
+ HbTextItem* mGenreItem;
+ HbTouchArea* mFavoriteTouchArea;
+ HbTextItem* mNameItem;
+ HbRichTextItem* mRadiotextItem;
+ HbTextItem* mUrlItem;
- };
-
- RadioStationCarousel& mCarousel;
-
- QScopedPointer<Data> mData;
+ Appearance mAppearance;
+ bool mOwnsCss;
+ CarouselItemFlags mFlags;
};
+Q_DECLARE_OPERATORS_FOR_FLAGS( RadioCarouselItem::CarouselItemFlags )
+
#endif // RADIOCAROUSELITEM_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioapp/radiowidgets/inc/radiocarouselitemobserver.h Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,40 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+#ifndef RADIOCAROUSELITEMOBSERVER_H
+#define RADIOCAROUSELITEMOBSERVER_H
+
+class RadioStation;
+class QString;
+class HbIcon;
+
+class RadioCarouselItemObserver
+{
+public:
+
+ virtual void handleIconClicked( const RadioStation& station ) = 0;
+ virtual void handleRadiotextClicked( const RadioStation& station ) = 0;
+ virtual void handleUrlClicked( const RadioStation& station ) = 0;
+ virtual QString localizeGenre( int genre ) = 0;
+ virtual bool isInManualSeek() const = 0;
+ virtual HbIcon favoriteIcon() const = 0;
+ virtual HbIcon nonFavoriteIcon() const = 0;
+ virtual RadioStation findStation( uint frequency ) = 0;
+
+};
+
+#endif // RADIOCAROUSELITEMOBSERVER_H
--- a/radioapp/radiowidgets/inc/radiofrequencyscanner.h Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radiowidgets/inc/radiofrequencyscanner.h Fri Jun 25 19:09:05 2010 +0300
@@ -20,8 +20,7 @@
// System includes
#include <QObject>
-#include <QScopedPointer>
-#include <QPointer>
+#include <QSharedPointer>
// Forward declarations
class HbProgressDialog;
@@ -74,13 +73,13 @@
bool mInMainView;
- QScopedPointer<RadioScannerEngine> mScannerEngine;
+ QSharedPointer<RadioScannerEngine> mScannerEngine;
/**
* Scanning progress note
* Own.
*/
- QPointer<HbProgressDialog> mScanningProgressNote;
+ QWeakPointer<HbProgressDialog> mScanningProgressNote;
int mStripScrollTime;
int mCarouselScrollTime;
--- a/radioapp/radiowidgets/inc/radiofrequencystrip.h Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radiowidgets/inc/radiofrequencystrip.h Fri Jun 25 19:09:05 2010 +0300
@@ -44,6 +44,7 @@
class WIDGETS_DLL_EXPORT RadioFrequencyStrip : public RadioStripBase
{
Q_OBJECT
+ Q_PROPERTY(int itemHeight READ itemHeight WRITE setItemHeight)
Q_PROPERTY(uint frequency READ frequency)
friend class RadioFrequencyItem;
@@ -52,6 +53,9 @@
RadioFrequencyStrip();
+ void setItemHeight( int itemHeight );
+ int itemHeight() const;
+
void init( RadioUiEngine* engine, RadioUiLoader& uiLoader );
void setFrequency( const uint frequency, int reason, Scroll::Direction direction = Scroll::Shortest );
@@ -93,7 +97,7 @@
void updateItemPrimitive( QGraphicsItem* itemToUpdate, int itemIndex );
QGraphicsItem* createItemPrimitive( QGraphicsItem *parent );
- void scrollPosChanged( QPointF newPosition );
+ void scrollPosChanged();
// from base class QGraphicsWidget
@@ -131,6 +135,8 @@
QPixmap drawPixmap( uint frequency, QList<RadioStation> stations, RadioFrequencyItem* item );
+ QLineF makeTab( qreal pos, int height );
+
void emitFrequencyChanged( uint frequency );
int selectorPos() const;
@@ -163,6 +169,8 @@
RadioUiEngine* mUiEngine;
+ int mItemHeight;
+
uint mMinFrequency;
uint mMaxFrequency;
--- a/radioapp/radiowidgets/inc/radiomainview.h Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radiowidgets/inc/radiomainview.h Fri Jun 25 19:09:05 2010 +0300
@@ -57,11 +57,13 @@
void skip( int skipMode );
void openStationsView();
void toggleScanning();
+ void toggleFavorite();
void seekingStarted();
void updateAntennaStatus( bool connected );
void updateAudioRoute( bool loudspeaker );
void setManualSeekMode( bool manualSeekActive );
void handleFavoriteChange( const RadioStation& station );
+ void saveActivity();
void toggleSkippingMode(); //TODO: Remove. Temporary test code
void resetFirstTimeCount(); //TODO: Remove. Temporary test code
@@ -70,6 +72,7 @@
// from base class RadioViewBase
+ void preLazyLoadInit();
void init();
void setOrientation();
void userAccepted();
@@ -78,6 +81,10 @@
bool eventFilter( QObject* watched, QEvent* event );
+// New functions
+
+ void updateFavoriteButton();
+
private: // data
QScopedPointer<RadioFrequencyScanner> mFrequencyScanner;
--- a/radioapp/radiowidgets/inc/radiostationcarousel.h Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radiowidgets/inc/radiostationcarousel.h Fri Jun 25 19:09:05 2010 +0300
@@ -21,9 +21,10 @@
// System includes
#include <HbScrollArea>
#include <HbIcon>
-#include <QPointer>
+#include <QWeakPointer>
// User includes
+#include "radiocarouselitemobserver.h"
#include "radiowidgetsexport.h"
#include "radio_global.h"
@@ -36,6 +37,7 @@
class RadioStationCarousel;
class RadioCarouselAnimator;
class HbLabel;
+class HbMenu;
namespace CarouselInfoText
{
@@ -53,6 +55,7 @@
// Class declaration
class WIDGETS_DLL_EXPORT RadioStationCarousel : public HbScrollArea
+ , public RadioCarouselItemObserver
{
Q_OBJECT
Q_PROPERTY(HbIcon favoriteIcon READ favoriteIcon WRITE setFavoriteIcon)
@@ -108,6 +111,8 @@
void setManualSeekMode( bool manualSeekActive );
+ void drawOffScreen( QPainter& painter );
+
void setAlternateSkippingMode( bool alternateSkipping ); //TODO: Remove this! This is test code
signals:
@@ -128,8 +133,6 @@
void updateRadioText( const RadioStation& station );
void updateStations();
void timerFired();
- void toggleFavorite();
-// void openContextMenu( HbAbstractViewItem* item, const QPointF& coords );
#ifdef USE_DEBUGGING_CONTROLS
void setRdsAvailable( bool available );
@@ -144,6 +147,15 @@
void showEvent( QShowEvent* event );
void gestureEvent( QGestureEvent* event );
+// from base class RadioCarouselItemObserver
+
+ void handleIconClicked( const RadioStation& station );
+ void handleRadiotextClicked( const RadioStation& station );
+ void handleUrlClicked( const RadioStation& station );
+ QString localizeGenre( int genre );
+ bool isInManualSeek() const;
+ RadioStation findStation( uint frequency );
+
// New functions
bool isInitialized() const;
@@ -182,10 +194,12 @@
QString mRadioTextHolder;
- QPointer<RadioCarouselAnimator> mAnimator;
+ QWeakPointer<RadioCarouselAnimator> mAnimator;
HbLabel* mInfoText;
+ HbMenu* mRadiotextPopup;
+
HbWidget* mContainer;
enum CarouselItem { LeftItem, CenterItem, RightItem };
@@ -209,7 +223,7 @@
bool mManualSeekMode;
bool mAlternateSkipping;
-
+
#ifdef USE_DEBUGGING_CONTROLS
RadioFadingLabel* mRdsLabel;
#endif
--- a/radioapp/radiowidgets/inc/radiostationsview.h Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radiowidgets/inc/radiostationsview.h Fri Jun 25 19:09:05 2010 +0300
@@ -21,7 +21,6 @@
// System includes
#include <HbIcon>
#include <QScopedPointer>
-#include <QPointer>
// User includes
#include "radioviewbase.h"
@@ -66,6 +65,7 @@
void finishScanning();
void updateVisibilities();
void clearList();
+ void play(); // Called from context menu
void rename(); // Called from context menu
void toggleFavorite(); // Called from context menu
void deleteStation(); // Called from context menu
@@ -86,7 +86,7 @@
RadioStationModel* mModel;
- QPointer<QSortFilterProxyModel> mFilterModel;
+ QSortFilterProxyModel* mFilterModel;
HbAction* mScanStationsAction;
HbAction* mClearListAction;
--- a/radioapp/radiowidgets/inc/radiostripbase.h Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radiowidgets/inc/radiostripbase.h Fri Jun 25 19:09:05 2010 +0300
@@ -29,7 +29,7 @@
class RadioStripBase : public HbScrollArea
{
Q_OBJECT
- Q_PROPERTY( int autoScrollTime READ autoScrollTime WRITE setAutoScrollTime )
+ Q_PROPERTY(int autoScrollTime READ autoScrollTime WRITE setAutoScrollTime)
public:
@@ -60,18 +60,18 @@
void mousePressEvent( QGraphicsSceneMouseEvent* event );
void mouseReleaseEvent( QGraphicsSceneMouseEvent* event );
-private slots:
-
- void scrollPositionChanged( QPointF newPosition );
-
private:
Q_DISABLE_COPY( RadioStripBase )
+// from base class HbScrollArea
+
+ bool scrollByAmount( const QPointF& delta );
+
virtual void updateItemPrimitive( QGraphicsItem* itemToUpdate, int itemIndex ) = 0;
virtual QGraphicsItem* createItemPrimitive( QGraphicsItem *parent ) = 0;
- virtual void scrollPosChanged( QPointF newPosition ) = 0;
+ virtual void scrollPosChanged() = 0;
void moveAllItemsToPool();
--- a/radioapp/radiowidgets/inc/radiouiloader.h Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radiowidgets/inc/radiouiloader.h Fri Jun 25 19:09:05 2010 +0300
@@ -39,13 +39,18 @@
// RadioMainView
static const QLatin1String MV_NAME_HISTORYVIEW_ACTION ( "mv:historyview_action" );
+ static const QLatin1String MV_NAME_CAROUSEL_BACKGROUND ( "mv:carousel_background" );
+ static const QLatin1String MV_NAME_CAROUSEL_OVERLAY ( "mv:carousel_overlay" );
static const QLatin1String MV_NAME_STATION_CAROUSEL ( "mv:station_carousel" );
+ static const QLatin1String MV_NAME_FREQUENCY_BACKGROUND ( "mv:frequency_background" );
static const QLatin1String MV_NAME_FREQUENCY_STRIP ( "mv:frequency_strip" );
static const QLatin1String MV_NAME_STATIONS_BUTTON ( "mv:stations_button" );
- static const QLatin1String MV_NAME_SCAN_BUTTON ( "mv:scan_button" );
+ static const QLatin1String MV_NAME_FAVORITE_BUTTON ( "mv:favorite_button" );
static const QLatin1String MV_NAME_SPEAKER_BUTTON ( "mv:loudspeaker_button" );
static const QLatin1String MV_NAME_PREV_BUTTON ( "mv:prev_button" );
static const QLatin1String MV_NAME_NEXT_BUTTON ( "mv:next_button" );
+ static const QLatin1String MV_NAME_SCAN_ACTION ( "mv:scan_action" );
+ static const QLatin1String MV_NAME_CAROUSEL_RT_MENU ( "mv:carousel_rt_menu" );
static const QLatin1String MV_SECTION_NO_ANTENNA ( "mv:no_antenna" );
static const QLatin1String MV_SECTION_SEEKING ( "mv:seeking" );
static const QLatin1String MV_SECTION_SCANNING ( "mv:scanning" );
@@ -60,6 +65,7 @@
static const QLatin1String SV_NAME_SCAN_ACTION ( "sv:scan_action" );
static const QLatin1String SV_NAME_CLEAR_LIST_ACTION ( "sv:clear_list_action" );
static const QLatin1String SV_NAME_SCAN_BUTTON ( "sv:scan_button" );
+ static const QLatin1String SV_NAME_PLAY_ACTION ( "sv:play_action" );
static const QLatin1String SV_NAME_RENAME_ACTION ( "sv:rename_action" );
static const QLatin1String SV_NAME_FAVORITE_ACTION ( "sv:toggle_favorite_action" );
static const QLatin1String SV_NAME_DELETE_ACTION ( "sv:delete_action" );
@@ -95,6 +101,7 @@
static const QLatin1String HV_NAME_CONTEXT_MENU ( "hv:context_menu" );
static const QLatin1String HV_NAME_TOGGLE_TAG_ACTION ( "hv:toggle_tag_action" );
static const QLatin1String HV_NAME_OVI_STORE_ACTION ( "hv:ovi_store_action" );
+ static const QLatin1String HV_NAME_OTHER_STORE_ACTION ( "hv:other_store_action" );
// History View Context Menu
static const QLatin1String HV_NAME_CONTEXT_TAG ( "hv:toggle_tag_action" );
--- a/radioapp/radiowidgets/inc/radioutil.h Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radiowidgets/inc/radioutil.h Fri Jun 25 19:09:05 2010 +0300
@@ -19,7 +19,7 @@
#define _RADIOUIUTILITIES_H_
// System includes
-#include <QPointer>
+#include <QWeakPointer>
// User includes
#include "radio_global.h"
@@ -79,15 +79,15 @@
private: // data
- QPointer<RadioFrequencyStrip> mFrequencyStrip;
+ QWeakPointer<RadioFrequencyStrip> mFrequencyStrip;
- QPointer<RadioStationCarousel> mCarousel;
+ QWeakPointer<RadioStationCarousel> mCarousel;
- QPointer<RadioFrequencyScanner> mScanner;
+ QWeakPointer<RadioFrequencyScanner> mScanner;
- QPointer<HbNotificationDialog> mNotificationDialog;
+ QWeakPointer<HbNotificationDialog> mNotificationDialog;
- Scan::Status mScanStatus;
+ Scan::Status mScanStatus;
};
--- a/radioapp/radiowidgets/inc/radioviewbase.h Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radiowidgets/inc/radioviewbase.h Fri Jun 25 19:09:05 2010 +0300
@@ -55,6 +55,8 @@
void setMembers( RadioWindow* mainWindow, RadioUiLoader* uiLoader );
+ virtual void preLazyLoadInit();
+
void initialize( QSharedPointer<RadioUiEngine> uiEngine );
bool isInitialized() const;
--- a/radioapp/radiowidgets/inc/radiowindow.h Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radiowidgets/inc/radiowindow.h Fri Jun 25 19:09:05 2010 +0300
@@ -21,7 +21,7 @@
// System includes
#include <HbMainWindow>
#include <HbEffect>
-#include <QPointer>
+#include <QWeakPointer>
#include <QScopedPointer>
#include <QSharedPointer>
#include <qsysteminfo.h>
@@ -39,11 +39,11 @@
typedef QScopedPointer<HbVolumeSliderPopup> VolumeSliderPtr;
/**
- * QPointer is used to store the views because it tracks the deletion of the object and nulls
+ * QWeakPointer is used to store the views because it tracks the deletion of the object and nulls
* the reference. Transient view like RadioHistoryView is destroyed after they are closed
- * and QPointer will notice it.
+ * and QWeakPointer will notice it.
*/
-typedef QPointer<RadioViewBase> ViewPtr;
+typedef QWeakPointer<RadioViewBase> ViewPtr;
// Class declaration
class WIDGETS_DLL_EXPORT RadioWindow : public HbMainWindow
--- a/radioapp/radiowidgets/radiowidgets.pro Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radiowidgets/radiowidgets.pro Fri Jun 25 19:09:05 2010 +0300
@@ -14,6 +14,7 @@
# Description:
#
+TMP_DIR_NAME = widgets
include(../buildflags.pri)
TEMPLATE = lib
@@ -50,6 +51,7 @@
HEADERS += radiofadinglabel.h
HEADERS += radiostationcarousel.h
HEADERS += radiocarouselitem.h
+HEADERS += radiocarouselitemobserver.h
HEADERS += radiocarouselanimator.h
HEADERS += radiohistoryview.h
--- a/radioapp/radiowidgets/res/effects/blink_in_out_in.fxml Fri Jun 11 13:38:32 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-<!-- flip and change opacity -->
-
-<layers>
- <visual>
- <param name="opacity" type="anim">
- <duration>1.0</duration>
- <style>easeinout</style>
- <keyframe at="0.0">0.3</keyframe>
- <keyframe at="1.0">1.0</keyframe>
- </param>
- </visual>
-</layers>
--- a/radioapp/radiowidgets/res/fmradioui.qrc Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radiowidgets/res/fmradioui.qrc Fri Jun 25 19:09:05 2010 +0300
@@ -4,12 +4,11 @@
<file>layout/mainview.docml</file>
<file>layout/stationsview.docml</file>
<file>layout/historyview.docml</file>
- <file>layout/radiostationitem.css</file>
- <file>layout/radiostationitem.widgetml</file>
+ <file>layout/radiocarouselitem.css</file>
+ <file>layout/radiocarouselitem.widgetml</file>
</qresource>
<qresource>
- <file>effects/blink_in_out_in.fxml</file>
<file>effects/fade_out.fxml</file>
<file>effects/fade_in.fxml</file>
<file>effects/slide_to_left.fxml</file>
@@ -19,24 +18,11 @@
</qresource>
<qresource>
- <file>images/stripbackground.png</file>
- <file>images/setfavoriteicon.png</file>
- <file>images/nowplayingicon.png</file>
- <file>images/qtg_mono_previous.svg</file>
- <file>images/qtg_mono_next.svg</file>
- <file>images/qtg_mono_radio_stations.svg</file>
- <file>images/qtg_mono_station_scan.svg</file>
- <file>images/qtg_mono_speaker.svg</file>
- <file>images/qtg_mono_speaker_off.svg</file>
- <file>images/pri_small_shazam.svg</file>
- <file>images/qtg_mono_play_history.svg</file>
<file>images/pri_small_star.svg</file>
<file>images/pri_small_star_inactive.svg</file>
<file>images/qtg_fr_lcd.svg</file>
<file>images/qtg_fr_lcd_overlay.svg</file>
<file>images/qtg_fr_tuner.svg</file>
- <file>images/qtg_mono_tag.svg</file>
- <file>images/pri_small_tag.svg</file>
</qresource>
</RCC>
Binary file radioapp/radiowidgets/res/images/nowplayingicon.png has changed
--- a/radioapp/radiowidgets/res/images/pri_small_shazam.svg Fri Jun 11 13:38:32 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
- <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
- xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
- x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
-<defs>
-</defs>
-<path opacity="0.6" d="M15,29C7.28,29,1,22.72,1,15C1,7.281,7.28,1,15,1s14,6.281,14,14C29,22.72,22.719,29,15,29L15,29z"/>
-<path d="M15,2c7.18,0,13,5.82,13,13c0,7.179-5.82,13-13,13C7.82,28,2,22.18,2,15C2,7.82,7.82,2,15,2z"/>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="305.8604" y1="367.5547" x2="305.8604" y2="392.4656" gradientTransform="matrix(1 0 0 1 -290.8594 -365.0547)">
- <stop offset="0" style="stop-color:#C9C9C9"/>
- <stop offset="0.0036" style="stop-color:#C5C5C5"/>
- <stop offset="0.1336" style="stop-color:#575757"/>
- <stop offset="0.2462" style="stop-color:#252525"/>
- <stop offset="0.4022" style="stop-color:#090909"/>
- <stop offset="0.5232" style="stop-color:#020202"/>
- <stop offset="0.8589" style="stop-color:#000000"/>
- <stop offset="0.9455" style="stop-color:#020202"/>
- <stop offset="1" style="stop-color:#303030"/>
-</linearGradient>
-<ellipse fill="url(#SVGID_1_)" cx="15" cy="15" rx="12.5" ry="12.5"/>
-<circle fill="#FFFFFF" cx="14.999" cy="15" r="0.693"/>
-<path fill="#FFFFFF" d="M12.267,21.033c1.907,0,3.698-0.736,5.045-2.078l0,0l1.592-1.583c0.329-0.329,0.494-0.754,0.494-1.185l0,0
- c0-0.426-0.165-0.854-0.497-1.184l0,0c-0.327-0.329-0.755-0.492-1.187-0.493l0,0c-0.434,0.001-0.863,0.165-1.193,0.494l0,0
- l-1.589,1.582c-0.709,0.702-1.657,1.097-2.657,1.097l0,0V17.68c-0.001,0.004-0.003,0.004-0.005,0.004l0,0h-0.025V17.68
- c-1.001-0.004-1.941-0.393-2.642-1.094l0,0c-0.71-0.707-1.107-1.651-1.109-2.652l0,0c0.001-1,0.399-1.946,1.108-2.654l0,0
- l3.941-3.92c0.329-0.33,0.493-0.756,0.493-1.188l0,0c0-0.43-0.164-0.856-0.491-1.184l0,0c-0.33-0.329-0.759-0.492-1.19-0.492l0,0
- c-0.434,0-0.864,0.164-1.192,0.493l0,0L7.219,8.911c-1.347,1.34-2.09,3.124-2.093,5.024l0,0v0.004c0,1.899,0.746,3.676,2.093,5.014
- l0,0C8.565,20.295,10.357,21.033,12.267,21.033L12.267,21.033"/>
-<path fill="#FFFFFF" d="M20.406,13.422c0.734,0.73,1.102,1.69,1.102,2.65l0,0c0,0.959-0.367,1.921-1.104,2.652l0,0l-3.942,3.921
- c-0.33,0.331-0.492,0.758-0.492,1.19l0,0c0,0.43,0.161,0.854,0.492,1.184l0,0c0.328,0.326,0.76,0.488,1.192,0.488l0,0
- c0.433,0,0.86-0.162,1.188-0.488l0,0l3.946-3.924c1.392-1.387,2.088-3.203,2.088-5.022l0,0c0-1.82-0.694-3.637-2.086-5.021l0,0
- c-1.351-1.343-3.138-2.08-5.052-2.08l0,0c-1.907,0-3.695,0.738-5.045,2.079l0,0l-1.591,1.584c-0.33,0.329-0.493,0.754-0.493,1.183
- l0,0c0,0.43,0.163,0.854,0.495,1.184l0,0c0.33,0.329,0.759,0.492,1.188,0.492l0,0c0.434,0,0.862-0.162,1.192-0.49l0,0l1.588-1.582
- c0.737-0.732,1.705-1.098,2.666-1.098l0,0C18.702,12.325,19.67,12.691,20.406,13.422L20.406,13.422z"/>
-<rect fill="none" width="30" height="30"/>
-</svg>
--- a/radioapp/radiowidgets/res/images/pri_small_tag.svg Fri Jun 11 13:38:32 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
- <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
- xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
- x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
-<defs>
-</defs>
-<path opacity="0.6" d="M2,12.731V4.094L4.094,2h8.638l15.683,15.684l-10.731,10.73L2,12.731z M6.904,5.952
- c-0.525,0-0.952,0.427-0.952,0.952s0.427,0.953,0.952,0.953S7.857,7.43,7.857,6.904S7.43,5.952,6.904,5.952L6.904,5.952z"/>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="14.9995" y1="3" x2="14.9995" y2="27.0005">
- <stop offset="0" style="stop-color:#4EDEFF"/>
- <stop offset="1" style="stop-color:#048CC6"/>
-</linearGradient>
-<path fill="url(#SVGID_1_)" d="M27,17.684L12.317,3h-7.81L3,4.508v7.81L17.683,27L27,17.684z M6.904,8.857
- c-1.078,0-1.952-0.875-1.952-1.953s0.874-1.952,1.952-1.952s1.953,0.874,1.953,1.952S7.982,8.857,6.904,8.857z"/>
-<path opacity="0.4" fill="#FFFFFF" d="M6.904,9.857c1.078,0,1.953-0.875,1.953-1.953c0-0.174-0.03-0.34-0.072-0.5
- C8.563,8.239,7.809,8.857,6.904,8.857S5.247,8.239,5.025,7.404c-0.043,0.16-0.073,0.326-0.073,0.5
- C4.952,8.982,5.826,9.857,6.904,9.857z"/>
-<polygon opacity="0.4" fill="#FFFFFF" points="12.317,4 26.5,18.184 27,17.684 12.317,3 4.508,3 3,4.508 3,5.508 4.508,4 "/>
-<rect x="10.07" y="12.386" transform="matrix(0.7071 0.7071 -0.7071 0.7071 16.0477 -6.6462)" fill="#FFFFFF" width="11.951" height="7.321"/>
-<polygon opacity="0.4" fill="#FFFFFF" points="17.683,22.859 9.232,14.429 8.662,15 17.683,24 23.43,18.254 22.859,17.684 "/>
-<polygon opacity="0.15" points="14.409,10.373 22.289,18.254 22.859,17.684 14.409,9.232 9.232,14.41 9.803,14.98 "/>
-<rect fill="none" width="30" height="30"/>
-</svg>
--- a/radioapp/radiowidgets/res/images/qtg_mono_next.svg Fri Jun 11 13:38:32 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
- <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
- xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
- x="0px" y="0px" width="30px" height="30px" viewBox="0 0.002 30 30" enable-background="new 0 0.002 30 30" xml:space="preserve">
-<defs>
-</defs>
-<g opacity="0.5">
- <rect fill="none" width="30" height="30"/>
-</g>
-<polygon points="20,4 20,15 20,26 24,26 24,4 "/>
-<polygon points="6,26 20,15 6,4 "/>
-</svg>
--- a/radioapp/radiowidgets/res/images/qtg_mono_play_history.svg Fri Jun 11 13:38:32 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
- <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
- xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
- x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
-<defs>
-</defs>
-<g opacity="0.5">
- <rect fill="none" width="30" height="30"/>
-</g>
-<path d="M22.5,13c0.232,0,0.461,0.019,0.688,0.035L25,12L4,0v24l9.998-5.713C15.555,15.159,18.776,13,22.5,13z"/>
-<path d="M22.5,15c-4.136,0-7.5,3.364-7.5,7.5s3.364,7.5,7.5,7.5s7.5-3.364,7.5-7.5S26.636,15,22.5,15z M22.5,28
- c-3.033,0-5.5-2.468-5.5-5.5s2.467-5.5,5.5-5.5s5.5,2.468,5.5,5.5S25.533,28,22.5,28z"/>
-<polygon points="23,22 23,18 21,18 21,22 21,24 23,24 27,24 27,22 "/>
-</svg>
--- a/radioapp/radiowidgets/res/images/qtg_mono_previous.svg Fri Jun 11 13:38:32 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
- <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
- xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
- x="0px" y="0px" width="30px" height="30px" viewBox="0 0.002 30 30" enable-background="new 0 0.002 30 30" xml:space="preserve">
-<defs>
-</defs>
-<g opacity="0.5">
- <rect fill="none" width="30" height="30"/>
-</g>
-<polygon points="6,4 6,26 10,26 10,15 10,4 "/>
-<polygon points="10,15 24,26 24,4 "/>
-</svg>
--- a/radioapp/radiowidgets/res/images/qtg_mono_radio_stations.svg Fri Jun 11 13:38:32 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948) -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
-<g opacity="0.5">
- <rect fill="none" width="30" height="30"/>
-</g>
-<rect x="7" y="6" width="2" height="2"/>
-<rect x="7" y="11" width="2" height="2"/>
-<rect x="7" y="16" width="2" height="2"/>
-<rect x="7" y="21" width="2" height="2"/>
-<rect x="10.059" y="6" width="9.942" height="2"/>
-<rect x="10.059" y="11" width="9.942" height="2"/>
-<rect x="10.059" y="21" width="4.941" height="2"/>
-<path d="M15,17c0-0.357,0.103-0.699,0.277-1h-5.219v2H15V17z"/>
-<path d="M11.322,26H5V3h18v10.841c0.23-0.124,0.473-0.216,0.727-0.243c0.101-0.24,0.246-0.461,0.435-0.648l1.362-1.363
- c0.145-0.144,0.308-0.252,0.478-0.342V0H2v29h9.325c-0.18-0.469-0.296-0.963-0.296-1.486C11.029,26.982,11.135,26.473,11.322,26z"/>
-<path d="M22.579,23.634L23.945,25c0.06-0.055,0.119-0.104,0.179-0.163c2.506-2.506,2.502-6.587-0.006-9.097
- c-0.058-0.057-0.117-0.104-0.173-0.154l-1.362,1.361c0.058,0.053,0.114,0.101,0.172,0.156c1.757,1.756,1.759,4.613,0.004,6.367
- C22.7,23.529,22.637,23.578,22.579,23.634z"/>
-<path d="M27.107,13.155c-0.055-0.056-0.112-0.101-0.17-0.155l-1.362,1.363c0.055,0.052,0.114,0.1,0.17,0.155
- c3.101,3.099,3.104,8.136,0.008,11.231c-0.058,0.058-0.121,0.108-0.183,0.164l1.367,1.366c0.06-0.057,0.123-0.107,0.183-0.166
- C30.965,23.27,30.961,17.008,27.107,13.155z"/>
-<path d="M22.029,19L17,17v8.305c-0.254-0.152-0.666-0.244-1.107-0.244c-1.583,0-2.864,1.098-2.864,2.453S14.31,30,15.893,30
- C17.475,30,19,29,19,27.514V21l3.029,1V19L22.029,19z"/>
-</svg>
--- a/radioapp/radiowidgets/res/images/qtg_mono_speaker.svg Fri Jun 11 13:38:32 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
- <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
- xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
- x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
-<defs>
-</defs>
-<g opacity="0.5">
- <rect fill="none" width="30" height="30"/>
-</g>
-<rect x="1" y="9" width="7" height="12"/>
-<polygon points="10,22 21,27 21,3 10,8 "/>
-<path d="M23.889,8.046L22.213,9.14C23.382,10.931,24,12.957,24,15s-0.618,4.069-1.787,5.86l1.676,1.094
- C25.27,19.836,26,17.432,26,15S25.27,10.164,23.889,8.046z"/>
-<path d="M26.702,5.398l-1.598,1.203C26.999,9.118,28,12.021,28,15s-1.001,5.882-2.896,8.398l1.598,1.203
- C28.859,21.735,30,18.416,30,15S28.859,8.265,26.702,5.398z"/>
-</svg>
--- a/radioapp/radiowidgets/res/images/qtg_mono_speaker_off.svg Fri Jun 11 13:38:32 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
- <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
- xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
- x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="none" width="30" height="30"/>
-<polygon points="4.853,9 1,9 1,21 8,21 8,12.148 "/>
-<polygon points="21,16.852 21,3 11.478,7.328 "/>
-<polygon points="10,14.148 10,22 21,27 21,25.146 "/>
-<rect x="13.74" y="-3.242" transform="matrix(0.7063 -0.7079 0.7079 0.7063 -6.0767 14.6963)" width="1.868" height="35.827"/>
-</svg>
--- a/radioapp/radiowidgets/res/images/qtg_mono_station_scan.svg Fri Jun 11 13:38:32 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
- <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
- xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
- x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
-<defs>
-</defs>
-<g opacity="0.5">
- <rect fill="none" width="30" height="30"/>
-</g>
-<rect x="13" y="8" width="4" height="15"/>
-<rect x="9" y="12" width="2" height="7"/>
-<rect x="5" y="12" width="2" height="7"/>
-<rect x="1" y="12" width="2" height="7"/>
-<rect x="27" y="12" width="2" height="7"/>
-<rect x="23" y="12" width="2" height="7"/>
-<rect x="19" y="12" width="2" height="7"/>
-</svg>
--- a/radioapp/radiowidgets/res/images/qtg_mono_tag.svg Fri Jun 11 13:38:32 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
- <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
- xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
- x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
-<defs>
-</defs>
-<g opacity="0.5">
- <rect fill="none" width="30" height="30"/>
-</g>
-<path d="M12.731,2H4.094L2,4.094v8.638l15.683,15.683l10.731-10.731L12.731,2z M4,11.903V4.922L4.922,4h6.981l13.683,13.683
- l-7.903,7.903L4,11.903z"/>
-<rect x="12.385" y="10.071" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -6.6464 16.0459)" width="7.321" height="11.95"/>
-<circle cx="7" cy="7" r="2"/>
-</svg>
Binary file radioapp/radiowidgets/res/images/setfavoriteicon.png has changed
Binary file radioapp/radiowidgets/res/images/stripbackground.png has changed
--- a/radioapp/radiowidgets/res/layout/historyview.docml Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radiowidgets/res/layout/historyview.docml Fri Jun 25 19:09:05 2010 +0300
@@ -14,10 +14,12 @@
</object>
<object name="hv:all_songs_button" type="HbAction">
<bool name="checkable" value="TRUE"/>
+ <icon iconName="qtg_mono_radio_stations" name="icon"/>
<string locid="txt_rad_button_recently_played_songs" name="text"/>
</object>
<object name="hv:tagged_songs_button" type="HbAction">
<bool name="checkable" value="TRUE"/>
+ <icon iconName="qtg_mono_favourites" name="icon"/>
<string locid="txt_rad_button_tagged_songs" name="text"/>
</object>
<object name="hv:toggle_tag_action" type="HbAction">
@@ -26,18 +28,13 @@
<object name="hv:ovi_store_action" type="HbAction">
<string locid="txt_rad_menu_search_from_music_store" name="text"/>
</object>
- <object name="hv:search_from_other_store_action" type="HbAction">
- <string locid="txt_rad_menu_search_from_other_store" name="text"/>
+ <object name="hv:other_store_action" type="HbAction">
+ <string value="Search from Amazon" name="text"/>
</object>
+
<widget name="view" type="HbView">
- <icon name="nonTaggedIcon" iconName=":/images/qtg_mono_tag.svg" />
- <icon name="taggedIcon" iconName=":/images/pri_small_tag.svg" />
- <widget name="hv:menu" role="HbView:menu" type="HbMenu">
- <ref object="hv:clear_list_action" role="HbMenu:addAction"/>
- <ref object="hv:add_songs_action" role="HbMenu:addAction"/>
- <ref object="loudspeaker_action" role="HbMenu:addAction"/>
- <ref object="exit_action" role="HbMenu:addAction"/>
- </widget>
+ <icon name="nonTaggedIcon" iconName="qtg_mono_tag" />
+ <icon name="taggedIcon" iconName="qtg_small_tag_inactive" />
<widget name="hv:toolbar" role="HbView:toolBar" type="HbToolBar">
<enums name="orientation" value="Horizontal"/>
<ref object="hv:all_songs_button" role="HbToolBar:addAction"/>
@@ -50,38 +47,7 @@
<fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
<string name="heading" locid="txt_rad_subhead_play_history" />
</widget>
- <widget name="hv:stacked_widget" type="HbWidget">
- <widget name="hv:history_list" type="HbListView">
- <sizehint height="320" type="PREFERRED" width="240"/>
- <bool name="visible" value="FALSE"/>
- </widget>
- <widget name="hv:empty_container" type="HbWidget">
- <widget name="hv:empty_title" type="HbLabel">
- <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
- <string locid="txt_rad_info_play_history_is_empty" name="plainText"/>
- <fontspec name="fontSpec" role="Title" textheight="33.5"/>
- </widget>
- <widget name="hv:empty_text" type="HbLabel">
- <enums name="textWrapping" value="TextWordWrap"/>
- <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
- <sizehint height="320" type="PREFERRED" width="240"/>
- <string locid="txt_rad_info_recently_played_songs_collects_song2" name="plainText"/>
- <fontspec name="fontSpec" role="Title" textheight="33.5"/>
- </widget>
- <layout orientation="Vertical" spacing="var(hb-param-margin-gene-middle-vertical)" type="linear">
- <contentsmargins bottom="var(hb-param-margin-gene-bottom)" left="var(hb-param-margin-gene-left)" right="var(hb-param-margin-gene-right)" top="var(hb-param-margin-gene-top)"/>
- <stretchitem stretchfactor="2"/>
- <linearitem itemname="hv:empty_title"/>
- <stretchitem stretchfactor="1"/>
- <linearitem itemname="hv:empty_text"/>
- <stretchitem stretchfactor="2"/>
- </layout>
- </widget>
- <layout type="stacked">
- <stackitem itemname="hv:history_list"/>
- <stackitem itemname="hv:empty_container"/>
- </layout>
- </widget>
+ <widget name="hv:stacked_widget" type="HbWidget" />
<layout type="anchor">
<anchoritem dst="hv:heading_banner" dstEdge="TOP" spacing="0un" src="" srcEdge="TOP"/>
<anchoritem dst="hv:heading_banner" dstEdge="LEFT" spacing="0un" src="" srcEdge="LEFT"/>
@@ -97,7 +63,55 @@
<widget name="hv:context_menu" type="HbMenu">
<ref object="hv:toggle_tag_action" role="HbMenu:addAction"/>
<ref object="hv:ovi_store_action" role="HbMenu:addAction"/>
+ <ref object="hv:other_store_action" role="HbMenu:addAction"/>
</widget>
+
+ <!-- Section to do lazy initialization of the view -->
+ <section name="lazy_load">
+ <widget name="view">
+ <widget name="hv:menu" role="HbView:menu" type="HbMenu">
+ <ref object="hv:clear_list_action" role="HbMenu:addAction"/>
+ <ref object="hv:add_songs_action" role="HbMenu:addAction"/>
+ <ref object="loudspeaker_action" role="HbMenu:addAction"/>
+ <ref object="exit_action" role="HbMenu:addAction"/>
+ </widget>
+ </widget>
+
+ <widget name="hv:stacked_widget">
+ <widget name="hv:history_list" type="HbListView">
+ <sizehint height="320" type="PREFERRED" width="240"/>
+ </widget>
+ <widget name="hv:empty_container" type="HbWidget">
+ <bool name="visible" value="FALSE"/>
+ <widget name="hv:empty_title" type="HbLabel">
+ <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
+ <string locid="txt_rad_info_play_history_is_empty" name="plainText"/>
+ <fontspec name="fontSpec" role="Title" textheight="33.5"/>
+ </widget>
+ <widget name="hv:empty_text" type="HbLabel">
+ <enums name="textWrapping" value="TextWordWrap"/>
+ <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
+ <sizehint height="320" type="PREFERRED" width="240"/>
+ <string locid="txt_rad_info_recently_played_songs_collects_song2" name="plainText"/>
+ <fontspec name="fontSpec" role="Title" textheight="33.5"/>
+ </widget>
+ <layout orientation="Vertical" spacing="var(hb-param-margin-gene-middle-vertical)" type="linear">
+ <contentsmargins bottom="var(hb-param-margin-gene-bottom)" left="var(hb-param-margin-gene-left)"
+ right="var(hb-param-margin-gene-right)" top="var(hb-param-margin-gene-top)"/>
+ <stretchitem stretchfactor="2"/>
+ <linearitem itemname="hv:empty_title"/>
+ <stretchitem stretchfactor="1"/>
+ <linearitem itemname="hv:empty_text"/>
+ <stretchitem stretchfactor="2"/>
+ </layout>
+ </widget>
+ <layout type="stacked">
+ <stackitem itemname="hv:history_list"/>
+ <stackitem itemname="hv:empty_container"/>
+ </layout>
+ </widget>
+ </section>
+
<section name="hv:show_list">
<widget name="hv:history_list">
<bool name="visible" value="TRUE"/>
--- a/radioapp/radiowidgets/res/layout/mainview.docml Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radiowidgets/res/layout/mainview.docml Fri Jun 25 19:09:05 2010 +0300
@@ -2,137 +2,180 @@
<hbdocument context="RadioMainView" version="0.9">
<widget name="view" type="HbView">
<widget name="mv:container" role="HbView:widget" type="HbWidget">
+
+ <!-- Information area that holds the station carousel -->
<widget name="mv:info_area" type="HbWidget">
<widget name="mv:carousel_background" type="HbLabel">
- <enums name="aspectRatioMode" value="IgnoreAspectRatio"/>
- <icon name="icon" iconName=":/images/qtg_fr_lcd.svg" />
- <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
+ <icon name="icon" iconName="qtg_fr_lcd" />
</widget>
- <widget name="mv:carousel_overlay" type="HbLabel">
- <enums name="aspectRatioMode" value="IgnoreAspectRatio"/>
- <icon name="icon" iconName=":/images/qtg_fr_lcd_overlay.svg" />
+ <widget name="mv:info_text" type="HbLabel" >
+ <contentsmargins top="var(hb-param-margin-gene-top)" bottom="var(hb-param-margin-gene-bottom)"
+ left="var(hb-param-margin-gene-left)" right="var(hb-param-margin-gene-right)" />
<enums name="alignment" value="AlignVCenter|AlignHCenter"/>
+ <string name="plainText" locid="txt_rad_info_fm_radio" />
+ <fontspec name="fontSpec" role="Title" textheight="8un" />
</widget>
<layout type="stacked">
<stackitem itemname="mv:carousel_background"/>
- <stackitem itemname="mv:carousel_overlay"/>
+ <stackitem itemname="mv:info_text"/>
+ </layout>
+ </widget>
+
+ <!-- Frequency area that holds the frequency strip -->
+ <widget name="mv:frequency_area" type="HbWidget">
+ <widget name="mv:frequency_background" type="HbLabel">
+ <icon name="icon" iconName="qtg_fr_lcd"/>
+ </widget>
+ <layout type="stacked">
+ <stackitem itemname="mv:frequency_background"/>
</layout>
</widget>
- <widget name="mv:control_widget" type="HbWidget" >
- <widget name="mv:stations_button" type="HbPushButton">
- <bool name="stretched" value="TRUE" />
- <string name="text" locid="txt_rad_button_stations" />
- <icon name="icon" iconName="qtg_mono_radio_stations" />
- </widget>
- <widget name="mv:scan_button" type="HbPushButton">
- <bool name="stretched" value="TRUE" />
- <string name="text" locid="txt_rad_button_search_all_stations" />
- <icon name="icon" iconName="qtg_mono_station_scan" />
- </widget>
- <widget name="mv:loudspeaker_button" type="HbPushButton">
- <bool name="stretched" value="TRUE" />
- <string name="text" locid="txt_rad_button_activate_loudspeaker" />
- <icon name="icon" iconName="qtg_mono_speaker" />
- </widget>
+
+ <!-- Control area that holds the three buttons -->
+ <widget name="mv:control_area" type="HbWidget" >
+ <widget name="mv:stations_button" type="HbPushButton" />
+ <widget name="mv:favorite_button" type="HbPushButton" />
+ <widget name="mv:loudspeaker_button" type="HbPushButton" />
<layout orientation="Vertical" spacing="var(hb-param-margin-gene-middle-vertical)" type="linear">
- <contentsmargins bottom="var(hb-param-margin-gene-bottom)" left="var(hb-param-margin-gene-left)" right="var(hb-param-margin-gene-right)" top="var(hb-param-margin-gene-top)"/>
+ <contentsmargins bottom="0un" left="0un" right="0un" top="0un" />
+ <stretchitem stretchfactor="1"/>
<linearitem itemname="mv:stations_button"/>
<stretchitem stretchfactor="1"/>
- <linearitem itemname="mv:scan_button"/>
+ <linearitem itemname="mv:favorite_button"/>
<stretchitem stretchfactor="1"/>
<linearitem itemname="mv:loudspeaker_button"/>
+ <stretchitem stretchfactor="1"/>
</layout>
</widget>
- <widget name="mv:frequency_area" type="HbWidget">
- <sizepolicy horizontalPolicy="Expanding" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
- <widget name="mv:frequency_background" type="HbLabel">
- <enums name="aspectRatioMode" value="IgnoreAspectRatio"/>
- <icon name="icon" iconName=":/images/qtg_fr_tuner.svg"/>
- </widget>
- <widget name="mv:frequency_strip" plugin="fmradiowidgetsplugin" type="RadioFrequencyStrip" />
- <layout type="stacked">
- <stackitem itemname="mv:frequency_background"/>
- <stackitem itemname="mv:frequency_strip"/>
- </layout>
- </widget>
+
</widget>
<string name="title" locid="txt_rad_title_fm_radio"/>
</widget>
+
+ <!-- Section to do lazy initialization of the view -->
<section name="lazy_load">
<object name="mv:historyview_action" type="HbAction">
<string name="text" locid="txt_rad_opt_play_history" />
</object>
+ <object name="mv:scan_action" type="HbAction">
+ <string name="text" locid="txt_rad_opt_search_all_stations" />
+ </object>
<object name="exit_action" type="HbAction">
<string name="text" locid="txt_common_opt_exit" />
</object>
<widget name="view">
<widget name="menu" role="HbView:menu" type="HbMenu">
<ref object="mv:historyview_action" role="HbMenu:addAction"/>
+ <ref object="mv:scan_action" role="HbMenu:addAction"/>
<ref object="exit_action" role="HbMenu:addAction"/>
</widget>
</widget>
<widget name="mv:info_area">
+ <widget name="mv:carousel_overlay" type="HbLabel">
+ <icon name="icon" iconName="qtg_fr_lcd_overlay" />
+ </widget>
<widget name="mv:station_carousel" plugin="fmradiowidgetsplugin" type="RadioStationCarousel">
- <icon name="favoriteIcon" iconName=":/images/pri_small_star.svg" />
+ <icon name="favoriteIcon" iconName="qtg_small_favorite" />
<icon name="nonFavoriteIcon" iconName=":/images/pri_small_star_inactive.svg" />
<integer name="autoScrollTime" value="1000"/>
- <widget name="mv:info_text" type="HbLabel" >
- <bool name="visible" value="FALSE"/>
- <sizehint height="200" width="300" type="PREFERRED"/>
- </widget>
+ </widget>
+ <widget name="mv:info_text">
+ <bool name="visible" value="FALSE" />
+ <string name="plainText" locid="" />
+ <enums name="alignment" value="AlignBottom|AlignHCenter"/>
+ <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)" />
</widget>
<layout type="stacked">
<stackitem itemname="mv:carousel_background"/>
<stackitem itemname="mv:carousel_overlay"/>
<stackitem itemname="mv:station_carousel"/>
+ <stackitem itemname="mv:info_text"/>
+ </layout>
+ </widget>
+ <widget name="mv:frequency_area">
+ <widget name="mv:frequency_strip" plugin="fmradiowidgetsplugin" type="RadioFrequencyStrip">
+ <contentsmargins left="var(hb-param-margin-gene-middle-horizontal)" right="var(hb-param-margin-gene-middle-horizontal)" />
+ <widget name="mv:prev_button" type="HbPushButton">
+ <icon name="icon" iconName="qtg_mono_previous" />
+ </widget>
+ <widget name="mv:next_button" type="HbPushButton">
+ <icon name="icon" iconName="qtg_mono_next" />
+ </widget>
+ <integer name="autoScrollTime" value="1000"/>
+ <integer name="itemHeight" value="9"/>
+ </widget>
+ <layout type="stacked">
+ <stackitem itemname="mv:frequency_background"/>
+ <stackitem itemname="mv:frequency_strip"/>
</layout>
</widget>
- <widget name="mv:frequency_strip">
- <widget name="mv:prev_button" type="HbPushButton">
- <icon name="icon" iconName="qtg_mono_previous" />
- </widget>
- <widget name="mv:next_button" type="HbPushButton">
- <icon name="icon" iconName="qtg_mono_next" />
- </widget>
- <integer name="autoScrollTime" value="1000"/>
+
+ <widget name="mv:stations_button">
+ <bool name="stretched" value="TRUE" />
+ <string name="text" locid="txt_rad_button_stations" />
+ <icon name="icon" iconName="qtg_mono_radio_stations" />
</widget>
+ <widget name="mv:favorite_button">
+ <bool name="stretched" value="TRUE" />
+ <string name="text" locid="txt_rad_button_add_to_favourites" />
+ <icon name="icon" iconName="qtg_mono_add_to_favourites" />
+ </widget>
+ <widget name="mv:loudspeaker_button">
+ <bool name="stretched" value="TRUE" />
+ <string name="text" locid="txt_rad_button_activate_loudspeaker" />
+ <icon name="icon" iconName="qtg_mono_speaker" />
+ </widget>
+
</section>
+
+ <!-- Section to orient the view in portrait mode -->
<section name="portrait">
<widget name="mv:frequency_area">
- <sizehint height="70" type="PREFERRED"/>
- </widget>
- <widget name="mv:info_area">
- <sizehint height="285" type="PREFERRED" width="360"/>
- </widget>
- <widget name="mv:control_widget">
- <sizehint height="285" type="PREFERRED" width="360"/>
+ <sizehint height="10un" type="FIXED"/>
</widget>
<widget name="mv:container">
- <layout orientation="Vertical" spacing="0un" type="linear">
- <linearitem itemname="mv:info_area" stretchfactor="1"/>
- <linearitem itemname="mv:frequency_area"/>
- <linearitem itemname="mv:control_widget" stretchfactor="1"/>
+ <layout type="anchor">
+ <anchoritem src="mv:info_area" srcEdge="TOP" dst="" dstEdge="TOP" spacing="-var(hb-param-margin-gene-middle-vertical)" />
+ <anchoritem src="mv:info_area" srcEdge="LEFT" dst="" dstEdge="LEFT" spacing="-var(hb-param-margin-gene-middle-horizontal)" />
+ <anchoritem src="mv:info_area" srcEdge="RIGHT" dst="" dstEdge="RIGHT" spacing="var(hb-param-margin-gene-middle-horizontal)" />
+
+ <anchoritem src="mv:frequency_area" srcEdge="CENTERV" dst="" dstEdge="CENTERV" spacing="0" />
+ <anchoritem src="mv:frequency_area" srcEdge="TOP" dst="mv:info_area" dstEdge="BOTTOM" spacing="-var(hb-param-margin-gene-middle-vertical)" />
+ <anchoritem src="mv:frequency_area" srcEdge="BOTTOM" dst="mv:control_area" dstEdge="TOP" spacing="var(hb-param-margin-gene-middle-vertical)" />
+ <anchoritem src="mv:frequency_area" srcEdge="LEFT" dst="" dstEdge="LEFT" spacing="-var(hb-param-margin-gene-middle-horizontal)" />
+ <anchoritem src="mv:frequency_area" srcEdge="RIGHT" dst="" dstEdge="RIGHT" spacing="var(hb-param-margin-gene-middle-horizontal)" />
+
+ <anchoritem src="mv:control_area" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" spacing="var(hb-param-margin-gene-middle-vertical)" />
+ <anchoritem src="mv:control_area" srcEdge="LEFT" dst="" dstEdge="LEFT" spacing="-var(hb-param-margin-gene-middle-horizontal)" />
+ <anchoritem src="mv:control_area" srcEdge="RIGHT" dst="" dstEdge="RIGHT" spacing="var(hb-param-margin-gene-middle-horizontal)" />
</layout>
</widget>
</section>
+
+ <!-- Section to orient the view in landscape mode -->
<section name="landscape">
<widget name="mv:frequency_area">
- <sizehint height="50" type="MINIMUM"/>
- </widget>
- <widget name="mv:info_area">
- <sizehint height="310" type="PREFERRED" width="320"/>
- </widget>
- <widget name="mv:control_widget">
- <sizehint height="310" type="PREFERRED" width="320"/>
+ <sizehint height="8un" type="FIXED"/>
</widget>
<widget name="mv:container">
- <layout spacing="0un" type="grid">
- <griditem column="0" itemname="mv:info_area" row="0"/>
- <griditem column="1" itemname="mv:control_widget" row="0"/>
- <griditem column="0" itemname="mv:frequency_area" row="1" column_span="2" />
+ <layout type="anchor">
+ <anchoritem src="mv:info_area" srcEdge="TOP" dst="" dstEdge="TOP" spacing="-var(hb-param-margin-gene-middle-vertical)" />
+ <anchoritem src="mv:info_area" srcEdge="LEFT" dst="" dstEdge="LEFT" spacing="-var(hb-param-margin-gene-middle-horizontal)" />
+ <anchoritem src="mv:info_area" srcEdge="RIGHT" dst="" dstEdge="CENTERH" spacing="expr(var(hb-param-margin-gene-middle-horizontal)/2)" />
+
+ <anchoritem src="mv:control_area" srcEdge="TOP" dst="" dstEdge="TOP" spacing="-var(hb-param-margin-gene-middle-vertical)" />
+ <anchoritem src="mv:control_area" srcEdge="RIGHT" dst="" dstEdge="RIGHT" spacing="var(hb-param-margin-gene-middle-horizontal)" />
+ <anchoritem src="mv:control_area" srcEdge="LEFT" dst="" dstEdge="CENTERH" spacing="-expr(var(hb-param-margin-gene-middle-horizontal)/2)" />
+
+ <anchoritem src="mv:frequency_area" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" spacing="var(hb-param-margin-gene-middle-vertical)" />
+ <anchoritem src="mv:frequency_area" srcEdge="TOP" dst="mv:info_area" dstEdge="BOTTOM" spacing="-var(hb-param-margin-gene-middle-vertical)" />
+ <anchoritem src="mv:frequency_area" srcEdge="TOP" dst="mv:control_area" dstEdge="BOTTOM" spacing="-var(hb-param-margin-gene-middle-vertical)" />
+ <anchoritem src="mv:frequency_area" srcEdge="RIGHT" dst="" dstEdge="RIGHT" spacing="var(hb-param-margin-gene-middle-vertical)" />
+ <anchoritem src="mv:frequency_area" srcEdge="LEFT" dst="" dstEdge="LEFT" spacing="-var(hb-param-margin-gene-middle-vertical)" />
</layout>
</widget>
</section>
+
<!-- Scanning layout -->
<section name="mv:scanning">
<object name="mv:historyview_action">
@@ -141,13 +184,16 @@
<widget name="mv:stations_button">
<bool name="visible" value="FALSE"/>
</widget>
- <widget name="mv:scan_button">
+ <widget name="mv:favorite_button">
<string name="text" locid="txt_rad_button_cancel" />
<icon name="icon" iconName=" " />
</widget>
<widget name="mv:loudspeaker_button">
<bool name="visible" value="FALSE"/>
</widget>
+ <object name="mv:scan_action">
+ <bool name="enabled" value="FALSE" />
+ </object>
</section>
<!-- Normal layout (not scanning) -->
@@ -158,13 +204,16 @@
<widget name="mv:stations_button">
<bool name="visible" value="TRUE"/>
</widget>
- <widget name="mv:scan_button">
- <string name="text" locid="txt_rad_button_search_all_stations" />
- <icon name="icon" iconName="qtg_mono_station_scan" />
+ <widget name="mv:favorite_button">
+ <string name="text" locid="txt_rad_button_add_to_favourites" />
+ <icon name="icon" iconName="qtg_mono_add_to_favourites" />
</widget>
<widget name="mv:loudspeaker_button">
<bool name="visible" value="TRUE"/>
</widget>
+ <object name="mv:scan_action">
+ <bool name="enabled" value="TRUE" />
+ </object>
</section>
<metadata activeUIState="portrait" display="NHD portrait" unit="un">
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioapp/radiowidgets/res/layout/radiocarouselitem.css Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,125 @@
+RadioCarouselItem
+{
+ layout: default;
+}
+
+RadioCarouselItem::star_button
+{
+ top: -var(hb-param-margin-gene-top);
+ left: -var(hb-param-margin-gene-left);
+ pref-width: var(hb-param-graphic-size-primary-medium);
+ pref-height: var(hb-param-graphic-size-primary-medium);
+ size-policy-horizontal: fixed;
+ size-policy-vertical: fixed;
+}
+
+RadioCarouselItem::genre_label
+{
+ top: -var(hb-param-margin-gene-top);
+ left: -var(hb-param-margin-gene-middle-horizontal);
+ right: expr(var(hb-param-margin-gene-left) + var(hb-param-graphic-size-primary-medium) + var(hb-param-margin-gene-middle-horizontal));
+ pref-height: var(hb-param-graphic-size-primary-medium);
+ size-policy-vertical: fixed;
+ size-policy-horizontal: expanding;
+}
+
+RadioCarouselItem::genre_label::text
+{
+ color: lightgray; /*var(qtc_lcd_title_normal);*/
+ text-height: var(hb-param-text-height-secondary);
+ font-variant: secondary;
+ text-align: center bottom;
+}
+
+RadioCarouselItem::name_label
+{
+ left: -var(hb-param-margin-gene-left);
+ right: var(hb-param-margin-gene-right);
+ size-policy-vertical: fixed;
+ size-policy-horizontal: expanding;
+}
+
+RadioCarouselItem[appearance=Full]::name_label
+{
+ pref-height: 8un;
+ top: 0un;
+}
+
+RadioCarouselItem[appearance!=Full]::name_label
+{
+ pref-height: 14un;
+ top: 1.5un;
+}
+
+RadioCarouselItem::name_label::text
+{
+ color: white; /*var(qtc_lcd_title_normal);*/
+ font-variant: primary;
+ text-wrap-mode: no-wrap;
+ text-align: center top;
+}
+
+RadioCarouselItem[appearance=Full]::name_label::text
+{
+ text-height: 8un;
+}
+
+RadioCarouselItem[appearance!=Full]::name_label::text
+{
+ text-height: 14un;
+}
+
+RadioCarouselItem::rt_label
+{
+ top: -16un;
+ left: -var(hb-param-margin-gene-left);
+ right: var(hb-param-margin-gene-right);
+ bottom: var(hb-param-margin-middle-vertical);
+ size-policy-vertical: expanding;
+}
+
+RadioCarouselItem::rt_label::text
+{
+ color: var(qtc_lcd_title_normal);
+ text-line-count-min: 1;
+ font-variant: secondary;
+}
+
+RadioCarouselItem[appearance=Full]::rt_label::text
+{
+ text-line-count-max: 4;
+ text-wrap-mode: word-wrap; /*wrap-anywhere; */
+ text-height: var(hb-param-text-height-secondary);
+ text-align: center center;
+}
+
+RadioCarouselItem[appearance!=Full]::rt_label::text
+{
+ text-line-count-max: 1;
+ text-wrap-mode: no-wrap;
+ text-height: 5un;
+ text-align: center center;
+}
+
+RadioCarouselItem::url_label
+{
+ left: -var(hb-param-margin-gene-left);
+ right: var(hb-param-margin-gene-right);
+ bottom: var(hb-param-margin-gene-bottom);
+}
+
+RadioCarouselItem::url_label::text
+{
+ text-height: var(hb-param-text-height-secondary);
+ font-variant: secondary;
+ text-align: center center;
+ color:var(qtc_lcd_link_normal);
+}
+
+RadioCarouselItem::favorite_touch_area
+{
+ top: 0un;
+ left: 0un;
+ right: -8un;
+ bottom: -4un;
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioapp/radiowidgets/res/layout/radiocarouselitem.widgetml Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,28 @@
+<hbwidget type="RadioCarouselItem" version="0.1">
+ <layout name="default" type="mesh">
+ <meshitem src="name_label" srcEdge="TOP" dst="genre_label" dstEdge="BOTTOM" />
+
+ <meshitem src="genre_label" srcEdge="TOP" dst="" dstEdge="TOP" />
+ <meshitem src="genre_label" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
+ <meshitem src="genre_label" srcEdge="LEFT" dst="star_button" dstEdge="RIGHT" />
+ <meshitem src="star_button" srcEdge="TOP" dst="" dstEdge="TOP" />
+ <meshitem src="star_button" srcEdge="LEFT" dst="" dstEdge="LEFT" />
+
+ <meshitem src="name_label" srcEdge="LEFT" dst="" dstEdge="LEFT" />
+ <meshitem src="name_label" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
+
+ <meshitem src="rt_label" srcEdge="TOP" dst="" dstEdge="TOP" />
+ <meshitem src="rt_label" srcEdge="LEFT" dst="" dstEdge="LEFT" />
+ <meshitem src="rt_label" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
+ <meshitem src="rt_label" srcEdge="BOTTOM" dst="url_label" dstEdge="TOP" />
+
+ <meshitem src="url_label" srcEdge="LEFT" dst="" dstEdge="LEFT" />
+ <meshitem src="url_label" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
+ <meshitem src="url_label" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
+
+ <meshitem src="favorite_touch_area" srcEdge="TOP" dst="star_button" dstEdge="TOP" />
+ <meshitem src="favorite_touch_area" srcEdge="LEFT" dst="star_button" dstEdge="LEFT" />
+ <meshitem src="favorite_touch_area" srcEdge="RIGHT" dst="star_button" dstEdge="RIGHT" />
+ <meshitem src="favorite_touch_area" srcEdge="BOTTOM" dst="star_button" dstEdge="BOTTOM" />
+ </layout>
+</hbwidget>
--- a/radioapp/radiowidgets/res/layout/radiostationitem.css Fri Jun 11 13:38:32 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-RadioCarouselItem {
- layout: default
-}
-
-RadioCarouselItem::favorite_button {
- max-width: 6un;
- max-height: 6un;
- top: -var(hb-param-margin-gene-top);
- left: -var(hb-param-margin-gene-left)
-}
-
-RadioCarouselItem::genre_label {
- pref-height: 6un;
- top: -var(hb-param-margin-gene-top);
- right: 8un;
- left: -var(hb-param-margin-gene-left);
-}
-
-RadioFadingLabel#genre_label::text {
- text-align: center;
- color: lightgray;
- font-variant: secondary;
-}
-
-RadioCarouselItem::name_label {
- pref-height: 5un;
- left: -var(hb-param-margin-gene-left);
- top: -var(hb-param-margin-gene-top);
- right: var(hb-param-margin-gene-right)
-}
-
-RadioFadingLabel#name_label::text {
- text-align: center;
- color: white;
- font-variant: primary;
-}
-
-RadioCarouselItem::rt_label {
- pref-height: 21un;
- left: -var(hb-param-margin-gene-left);
- top: -var(hb-param-margin-gene-top);
- right: var(hb-param-margin-gene-right);
-}
-
-RadioFadingLabel#rt_label::text {
- text-align: center;
- color: white;
- font-variant: secondary;
-}
-
-RadioCarouselItem::url_label {
- pref-height: 5un;
- left: -var(hb-param-margin-gene-left);
- top: -var(hb-param-margin-gene-top);
- right: var(hb-param-margin-gene-right);
- bottom: var(hb-param-margin-gene-bottom);
-}
-
-RadioFadingLabel#url_label::text {
- text-align: center;
- color: white;
- font-variant: secondary;
-}
--- a/radioapp/radiowidgets/res/layout/radiostationitem.widgetml Fri Jun 11 13:38:32 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<hbwidget type="RadioCarouselItem" version="0.1">
- <layout name="default" type="mesh">
- <meshitem dst="" dstEdge="TOP" src="favorite_button" srcEdge="TOP"/>
- <meshitem dst="" dstEdge="LEFT" src="favorite_button" srcEdge="LEFT"/>
-
- <meshitem dst="" dstEdge="TOP" src="genre_label" srcEdge="TOP"/>
- <meshitem dst="favorite_button" dstEdge="RIGHT" src="genre_label" srcEdge="LEFT"/>
- <meshitem dst="" dstEdge="RIGHT" src="genre_label" srcEdge="RIGHT"/>
-
- <meshitem dst="favorite_button" dstEdge="BOTTOM" src="name_label" srcEdge="TOP"/>
- <meshitem dst="" dstEdge="LEFT" src="name_label" srcEdge="LEFT"/>
- <meshitem dst="" dstEdge="RIGHT" src="name_label" srcEdge="RIGHT"/>
-
- <meshitem dst="name_label" dstEdge="BOTTOM" src="rt_label" srcEdge="TOP"/>
- <meshitem dst="" dstEdge="LEFT" src="rt_label" srcEdge="LEFT"/>
- <meshitem dst="" dstEdge="RIGHT" src="rt_label" srcEdge="RIGHT"/>
-
- <meshitem dst="rt_label" dstEdge="BOTTOM" src="url_label" srcEdge="TOP"/>
- <meshitem dst="" dstEdge="LEFT" src="url_label" srcEdge="LEFT"/>
- <meshitem dst="" dstEdge="RIGHT" src="url_label" srcEdge="RIGHT"/>
- <meshitem dst="" dstEdge="BOTTOM" src="url_label" srcEdge="BOTTOM"/>
- </layout>
-</hbwidget>
--- a/radioapp/radiowidgets/res/layout/stationsview.docml Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radiowidgets/res/layout/stationsview.docml Fri Jun 25 19:09:05 2010 +0300
@@ -26,17 +26,17 @@
</object>
<object name="sv:local_stations_button" type="HbAction">
<bool name="checkable" value="TRUE"/>
- <icon iconName=":/images/pri_small_star_inactive.svg" name="icon"/>
+ <icon iconName="qtg_mono_radio_stations" name="icon"/>
<string name="text" locid="txt_rad_button_local_stations" />
</object>
<object name="sv:favorite_stations_button" type="HbAction">
<bool name="checkable" value="TRUE"/>
- <icon iconName=":/images/pri_small_star.svg" name="icon"/>
+ <icon iconName="qtg_mono_favourites" name="icon"/>
<string name="text" locid="txt_rad_button_favourites" />
</object>
<widget name="view" type="HbView">
- <icon name="nowPlayingIcon" iconName=":/images/nowplayingicon.png" />
- <icon name="favoriteIcon" iconName=":/images/pri_small_star.svg" />
+ <icon name="nowPlayingIcon" iconName="qtg_mono_play" />
+ <icon name="favoriteIcon" iconName="qtg_small_favorite" />
<widget name="mMenu" role="HbView:menu" type="HbMenu">
<ref object="sv:scan_action" role="HbMenu:addAction"/>
<ref object="sv:clear_list_action" role="HbMenu:addAction"/>
--- a/radioapp/radiowidgets/src/radiocarouselitem.cpp Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radiowidgets/src/radiocarouselitem.cpp Fri Jun 25 19:09:05 2010 +0300
@@ -17,107 +17,70 @@
// System includes
#include <HbStyleLoader>
-#include <HbPushButton>
-#include <HbAnchorLayout>
-#include <HbMessageBox>
+#include <HbTextItem>
+#include <HbRichTextItem>
+#include <HbIconItem>
+#include <HbTouchArea>
+#include <HbTapGesture>
+#include <QPainter>
// User includes
#include "radiocarouselitem.h"
+#include "radiocarouselitemobserver.h"
#include "radiostation.h"
-#include "radiostationcarousel.h"
-#include "radiouiengine.h"
-#include "radiofadinglabel.h"
-#include "radiostationmodel.h"
#include "radiologger.h"
-//static const char* FILE_PATH_WIDGETML = ":/layout/radiostationitem.widgetml";
-//static const char* FILE_PATH_CSS = ":/layout/radiostationitem.css";
-static const char* GENRE_LABEL = "tv:genre_label";
-static const char* NAME_LABEL = "tv:name_label";
-static const char* RADIOTEXT_LABEL = "tv:radiotext_label";
-static const char* URL_LABEL = "tv:url_label";
-//static const char* FAVORITE_BUTTON = "favorite_button";
+const QLatin1String FILE_PATH_WIDGETML ( ":/layout/radiocarouselitem.widgetml" );
+const QLatin1String FILE_PATH_CSS ( ":/layout/radiocarouselitem.css" );
+const QLatin1String ICON_BUTTON ( "star_button" );
+const QLatin1String GENRE_LABEL ( "genre_label" );
+const QLatin1String FAVORITE_TOUCH_AREA ( "favorite_touch_area" );
+const QLatin1String NAME_LABEL ( "name_label" );
+const QLatin1String RT_LABEL ( "rt_label" );
+const QLatin1String URL_LABEL ( "url_label" );
-const char* SEEKING_TEXT = "txt_rad_list_tuning";
-const char* CONNECT_HEADSET_TEXT = "txt_rad_list_connect_wireless_antenna_headset_with";
+const QLatin1String SEEKING_TEXT ( "txt_rad_list_tuning" );
+const QLatin1String CONNECT_HEADSET_TEXT( "txt_rad_list_connect_wireless_antenna_headset_with" );
/*!
*
*/
-RadioCarouselItem::RadioCarouselItem( RadioStationCarousel& carousel ) :
- HbWidget( &carousel ),
- mCarousel( carousel ),
- mData( new Data() )
-{
- mData->mStation.reset( new RadioStation() );
-
- mData->mIconButton.reset( new HbPushButton( this ) );
- QPixmap background( QSize( 70, 70 ) );
- background.fill( Qt::transparent );
- mData->mIconButton->setBackground( HbIcon( background ) );
- mData->mIconButton->setIcon( mCarousel.nonFavoriteIcon() );
-
- Radio::connect( mData->mIconButton.data(), SIGNAL(clicked()),
- &mCarousel, SLOT(toggleFavorite()));
-
- mData->mNameLabel.reset( new RadioFadingLabel( this ) );
- mData->mNameLabel->setAlignment( Qt::AlignCenter );
- mData->mNameLabel->setObjectName( NAME_LABEL );
- HbFontSpec spec = mData->mNameLabel->fontSpec();
- spec.setRole( HbFontSpec::Primary );
- spec.setTextHeight( 40 );
- mData->mNameLabel->setFontSpec( spec );
-
- spec.setRole( HbFontSpec::Secondary );
-
- mData->mGenreLabel.reset( new RadioFadingLabel( this ) );
- mData->mGenreLabel->setAlignment( Qt::AlignCenter );
- mData->mGenreLabel->setObjectName( GENRE_LABEL );
- mData->mGenreLabel->setTextColor( Qt::white );
+static void registerAndCheck( const QString& file ) {
+ bool registered = HbStyleLoader::registerFilePath( file );
+ Q_ASSERT_X( registered, "RadioCarouselItem", "Failed to register CSS or WIDGETML!" );
+}
- mData->mRadiotextLabel.reset( new RadioFadingLabel( this ) );
- mData->mRadiotextLabel->setAlignment( Qt::AlignCenter );
- mData->mRadiotextLabel->setObjectName( RADIOTEXT_LABEL );
- mData->mRadiotextLabel->setTextWrapping( Hb::TextWordWrap );
-// mRadiotextLabel->setFadingEnabled( true ); TODO
-// mRadiotextLabel->setFontSpec( spec );
- mData->mRadiotextLabel->setTextColor( Qt::white );
-
- mData->mUrlLabel.reset( new RadioFadingLabel( this ) );
- mData->mUrlLabel->setAlignment( Qt::AlignCenter );
- mData->mUrlLabel->setObjectName( URL_LABEL );
- mData->mUrlLabel->setTextColor( Qt::white );
-
- mData->mLayout = new HbAnchorLayout();
- HbAnchorLayout* layout = mData->mLayout;
-
- HbPushButton* iconButton = mData->mIconButton.data();
- RadioFadingLabel* nameLabel = mData->mNameLabel.data();
- RadioFadingLabel* genreLabel = mData->mGenreLabel.data();
- RadioFadingLabel* urlLabel = mData->mUrlLabel.data();
- RadioFadingLabel* radiotextLabel = mData->mRadiotextLabel.data();
+/*!
+ *
+ */
+RadioCarouselItem::RadioCarouselItem( RadioCarouselItemObserver& observer, QGraphicsItem* parent, bool registerCss ) :
+ HbWidget( parent ),
+ mObserver( observer ),
+ mFavoriteItem( NULL ),
+ mGenreItem( NULL ),
+ mFavoriteTouchArea( NULL ),
+ mNameItem( NULL ),
+ mRadiotextItem( NULL ),
+ mUrlItem( NULL ),
+ mAppearance( Default ),
+ mOwnsCss( registerCss ),
+ mFlags( DefaultFlags )
+{
+ mStation.reset( new RadioStation() );
- layout->setAnchor( layout, Hb::TopEdge, iconButton, Hb::TopEdge, 20.0 );
- layout->setAnchor( layout, Hb::LeftEdge, iconButton, Hb::LeftEdge, 20.0 );
-
- layout->setAnchor( iconButton, Hb::CenterVEdge, genreLabel, Hb::CenterVEdge, 0.0 );
- layout->setAnchor( iconButton, Hb::RightEdge, genreLabel, Hb::LeftEdge, 20.0 );
- layout->setAnchor( layout, Hb::RightEdge, genreLabel, Hb::RightEdge, -70.0 );
-
- layout->setAnchor( genreLabel, Hb::BottomEdge, nameLabel, Hb::TopEdge, 0.0 );
- layout->setAnchor( layout, Hb::LeftEdge, nameLabel, Hb::LeftEdge, 10.0 );
- layout->setAnchor( layout, Hb::RightEdge, nameLabel, Hb::RightEdge, -10.0 );
+ if ( mOwnsCss ) {
+ registerAndCheck( FILE_PATH_CSS );
+ registerAndCheck( FILE_PATH_WIDGETML );
+ }
- layout->setAnchor( nameLabel, Hb::BottomEdge, radiotextLabel, Hb::TopEdge, 10.0 );
- layout->setAnchor( layout, Hb::LeftEdge, radiotextLabel, Hb::LeftEdge, 10.0 );
- layout->setAnchor( layout, Hb::RightEdge, radiotextLabel, Hb::RightEdge, -10.0 );
+ createPrimitives();
+ updatePrimitives();
- layout->setAnchor( radiotextLabel, Hb::BottomEdge, urlLabel, Hb::TopEdge, 10.0 );
- layout->setAnchor( layout, Hb::LeftEdge, urlLabel, Hb::LeftEdge, 10.0 );
- layout->setAnchor( layout, Hb::RightEdge, urlLabel, Hb::RightEdge, -10.0 );
- layout->setAnchor( layout, Hb::BottomEdge, urlLabel, Hb::BottomEdge, -10.0 );
+ updateFavoriteIcon( false );
- setLayout( layout );
+ updateVisibilities();
+
+ grabGesture( Qt::TapGesture );
}
/*!
@@ -125,6 +88,172 @@
*/
RadioCarouselItem::~RadioCarouselItem()
{
+ if ( mOwnsCss ) {
+ HbStyleLoader::unregisterFilePath( FILE_PATH_CSS );
+ HbStyleLoader::unregisterFilePath( FILE_PATH_WIDGETML );
+ }
+}
+
+/*!
+ *
+ */
+void RadioCarouselItem::createPrimitives()
+{
+ mFavoriteItem = new HbIconItem( this );
+ HbStyle::setItemName( mFavoriteItem, ICON_BUTTON );
+
+ mGenreItem = new HbTextItem( this );
+ HbStyle::setItemName( mGenreItem, GENRE_LABEL );
+
+ mNameItem = new HbTextItem( this );
+ HbStyle::setItemName( mNameItem, NAME_LABEL );
+
+ mRadiotextItem = new HbRichTextItem( this );
+ HbStyle::setItemName( mRadiotextItem, RT_LABEL );
+
+ mUrlItem = new HbTextItem( this );
+ HbStyle::setItemName( mUrlItem, URL_LABEL );
+
+ mFavoriteTouchArea = new HbTouchArea( this );
+ HbStyle::setItemName( mFavoriteTouchArea, FAVORITE_TOUCH_AREA );
+
+ // Matti testing needs these
+ mFavoriteItem->setObjectName( ICON_BUTTON );
+ mGenreItem->setObjectName( GENRE_LABEL );
+ mNameItem->setObjectName( NAME_LABEL );
+ mRadiotextItem->setObjectName( RT_LABEL );
+ mUrlItem->setObjectName( URL_LABEL );
+ mFavoriteTouchArea->setObjectName( FAVORITE_TOUCH_AREA );
+}
+
+/*!
+ *
+ */
+void RadioCarouselItem::drawOffScreen( QPainter& painter )
+{
+ QStyleOptionGraphicsItem option;
+
+ foreach ( QGraphicsItem* child, childItems() ) {
+ QGraphicsWidget* childWidget = static_cast<QGraphicsWidget*>( child );
+ option.exposedRect = childWidget->rect();
+ painter.save();
+ painter.translate( childWidget->pos() );
+ childWidget->paint( &painter, &option, NULL );
+ painter.restore();
+ }
+}
+
+/*!
+ *
+ */
+void RadioCarouselItem::updatePrimitives()
+{
+ update();
+}
+
+/*!
+ * \reimp
+ */
+void RadioCarouselItem::gestureEvent( QGestureEvent* event )
+{
+ if ( HbTapGesture* gesture = qobject_cast<HbTapGesture*>( event->gesture( Qt::TapGesture ) ) ) {
+ if ( gesture->state() == Qt::GestureFinished ) {
+ const QPointF mappedHotSpot = event->mapToGraphicsScene( gesture->hotSpot() );
+
+ if ( mFlags.testFlag( FavoriteTouchable ) &&
+ mFavoriteTouchArea->sceneBoundingRect().contains( mappedHotSpot ) ) {
+
+ mObserver.handleIconClicked( *mStation );
+
+ } else if ( mFlags.testFlag( RadiotextTouchable ) &&
+ mRadiotextItem->sceneBoundingRect().contains( mappedHotSpot ) ) {
+
+ mObserver.handleRadiotextClicked( *mStation );
+
+ } else if ( mFlags.testFlag( UrlTouchable ) &&
+ mUrlItem->sceneBoundingRect().contains( mappedHotSpot ) ) {
+
+ mObserver.handleUrlClicked( *mStation );
+
+ }
+ }
+ }
+}
+
+/*!
+ *
+ */
+void RadioCarouselItem::setFlags( CarouselItemFlags flags )
+{
+ mFlags |= flags;
+ updateVisibilities();
+}
+
+/*!
+ *
+ */
+void RadioCarouselItem::clearFlags( CarouselItemFlags flags )
+{
+ for ( int i = 1; i < LastFlagMarker; i = i << 1 ) {
+ if ( flags.testFlag( static_cast<ItemFlag>( i ) ) ) {
+ mFlags &= ~i;
+ }
+ }
+ updateVisibilities();
+}
+
+/*!
+ *
+ */
+void RadioCarouselItem::updateVisibilities()
+{
+ mFavoriteItem->setVisible( mFlags.testFlag( FavoriteVisible ) );
+ mGenreItem->setVisible( mFlags.testFlag( GenreVisible ) );
+ mRadiotextItem->setVisible( mFlags.testFlag( RadiotextVisible ) );
+ mUrlItem->setVisible( mFlags.testFlag( UrlVisible ) );
+}
+
+/*!
+ *
+ */
+void RadioCarouselItem::setAppearance( Appearance appearance )
+{
+ mAppearance = appearance;
+
+ if ( mAppearance == ManualSeek ) {
+ mFlags = ManualSeekFlags;
+ mGenreItem->setText( "" );
+ mRadiotextItem->setText( "" );
+ mUrlItem->setText( "" );
+ mNameItem->setText( mStation->frequencyString() );
+ updateFavoriteIcon( false );
+ } else {
+ mFlags = DefaultFlags;
+ }
+
+ updateVisibilities();
+
+ repolish();
+}
+
+/*!
+ *
+ */
+RadioCarouselItem::Appearance RadioCarouselItem::appearance() const
+{
+ return mAppearance;
+}
+
+/*!
+ *
+ */
+void RadioCarouselItem::setSeekLayout( bool seekLayout )
+{
+ if ( seekLayout ) {
+ setAppearance( ManualSeek );
+ } else {
+ setAppearance( mStation->radioText().isEmpty() ? Default : Full );
+ }
}
/*!
@@ -132,21 +261,11 @@
*/
void RadioCarouselItem::setStation( const RadioStation& station )
{
- *mData->mStation = station;
- update();
-}
+ *mStation = station;
-/*!
- *
- */
-void RadioCarouselItem::swapData( RadioCarouselItem& other )
-{
- RadioCarouselItem::Data* tempData = mData.take();
- mData.reset( other.mData.data() );
- other.mData.reset( tempData );
+ updateLayout();
- other.setLayout( other.mData->mLayout );
- setLayout( mData->mLayout );
+ update();
}
/*!
@@ -154,7 +273,7 @@
*/
uint RadioCarouselItem::frequency() const
{
- return mData->mStation->frequency();
+ return mStation->frequency();
}
/*!
@@ -163,29 +282,43 @@
void RadioCarouselItem::update( const RadioStation* station )
{
if ( station ) {
- *mData->mStation = *station;
+ *mStation = *station;
+ updateLayout();
}
- if ( mData->mStation->isValid() ) {
- mData->mNameLabel->setTextWithoutFading( mData->mStation->nameOrFrequencyMhz() );
-
-// mData->mGenreLabel->setText( "Rock Music" );
-// mData->mRadiotextLabel->setText( "This is a bit of radio text that should span many lines" );
-// mData->mUrlLabel->setText( "www.radiorock.fi" );
+ if ( mStation->isValid() ) {
+ mGenreItem->setText( mObserver.localizeGenre( mStation->genre() ) );
- mData->mGenreLabel->setText( mCarousel.uiEngine()->genreToString( mData->mStation->genre(), GenreTarget::Carousel ) );
-
- if ( !mData->mStation->radioText().isEmpty() ) {
- mData->mRadiotextLabel->setText( mData->mStation->radioText() );
- } else if ( !mData->mStation->dynamicPsText().isEmpty() ) {
- mData->mRadiotextLabel->setText( mData->mStation->dynamicPsText() );
+ const bool hasName = mStation->hasName();
+ if ( hasName ) {
+ mNameItem->setText( mStation->name() );
} else {
- mData->mRadiotextLabel->setText( "" );
+ mNameItem->setText( mStation->frequencyString() );
}
- mData->mUrlLabel->setText( mData->mStation->url() );
+ if ( mStation->hasRadiotext() ) {
+ mRadiotextItem->setText( mStation->radioText() );
+ } else {
+ if ( mStation->hasDynamicPs() ) {
+ mRadiotextItem->setText( mStation->dynamicPsText() );
+ } else if ( hasName ) {
+ const QString loc = "%L1 Mhz"; //hbTrId( "txt_rad_list_l1_mhz_small" );
+ mRadiotextItem->setText( loc.arg( mStation->frequencyString() ) );
+ } else {
+ mRadiotextItem->setText( "" );
+ }
+ }
- updateFavoriteIcon( mData->mStation->isFavorite() );
+ mUrlItem->setText( mStation->url() );
+ if ( mStation->hasUrl() ) {
+ HbStyle::setItemName( mUrlItem, URL_LABEL );
+ setFlags( UrlVisible | UrlTouchable );
+ } else {
+ HbStyle::setItemName( mUrlItem, "" ); // Clear the name so the item disappears from layout
+ clearFlags( UrlVisible | UrlTouchable );
+ }
+
+ updateFavoriteIcon( mStation->isFavorite() );
} else {
cleanRdsData();
}
@@ -196,17 +329,12 @@
*/
void RadioCarouselItem::setFrequency( uint frequency )
{
-// LOG_FORMAT( "RadioCarouselItem::setFrequency: %d", frequency );
+ LOG_FORMAT( "RadioCarouselItem::setFrequency: %d", frequency );
- if ( !mCarousel.mManualSeekMode ) {
- mData->mStation->setFrequency( frequency );
- mData->mNameLabel->setTextWithoutFading( parseFrequency( frequency ) );
- mData->mGenreLabel->setTextWithoutFading( "" );
- mData->mRadiotextLabel->setTextWithoutFading( "" );
- mData->mUrlLabel->setTextWithoutFading( "" );
- updateFavoriteIcon( false );
- } else {
- mData->mNameLabel->setTextWithoutFading( parseFrequency( frequency ) );
+ mNameItem->setText( RadioStation::parseFrequency( frequency ) );
+
+ if ( !mObserver.isInManualSeek() ) {
+ *mStation = mObserver.findStation( frequency );
}
}
@@ -215,22 +343,9 @@
*/
void RadioCarouselItem::cleanRdsData()
{
- if ( !mCarousel.mManualSeekMode ) {
- mData->mNameLabel->setTextWithoutFading( "" );
- }
- mData->mGenreLabel->setTextWithoutFading( "" );
- mData->mRadiotextLabel->setTextWithoutFading( "" );
- mData->mUrlLabel->setTextWithoutFading( "" );
- mData->mIconButton->setIcon( HbIcon( "" ) );
-}
-
-/*!
- *
- */
-void RadioCarouselItem::handleLongPress( const QPointF& /*coords*/ )
-{
-// QString text = QString( "Selected frequency: %1" ).arg( mFrequency );
-// HbMessageBox::information( text );
+ mGenreItem->setText( "" );
+ mRadiotextItem->setText( "" );
+ mUrlItem->setText( "" );
}
/*!
@@ -238,23 +353,7 @@
*/
void RadioCarouselItem::setRadioText( const QString& text )
{
- mData->mRadiotextLabel->setHtml( text );
-}
-
-/*!
- *
- */
-void RadioCarouselItem::setSeekLayout( bool seekLayout )
-{
- HbFontSpec spec = mData->mNameLabel->fontSpec();
- mData->mSeekLayout = seekLayout;
- if ( seekLayout ) {
- cleanRdsData();
- spec.setTextHeight( 60 );
- } else {
- spec.setTextHeight( 40 );
- }
- mData->mNameLabel->setFontSpec( spec );
+ mRadiotextItem->setText( text );
}
/*!
@@ -262,27 +361,16 @@
*/
void RadioCarouselItem::setItemVisibility( ItemVisibility visibility )
{
- mData->mIconButton->setEnabled( true );
+ CarouselItemFlags flags = 0;
if ( visibility == AllVisible ) {
- mData->mNameLabel->setVisible( true );
- mData->mGenreLabel->setVisible( true );
- mData->mRadiotextLabel->setVisible( true );
- mData->mUrlLabel->setVisible( true );
- mData->mIconButton->setVisible( true );
+ flags = DefaultFlags;
} else if ( visibility == AllHidden ) {
- mData->mNameLabel->setVisible( false );
- mData->mGenreLabel->setVisible( false );
- mData->mRadiotextLabel->setVisible( false );
- mData->mUrlLabel->setVisible( false );
- mData->mIconButton->setVisible( false );
+
} else if ( visibility == IconVisible ) {
- mData->mNameLabel->setVisible( false );
- mData->mGenreLabel->setVisible( false );
- mData->mRadiotextLabel->setVisible( false );
- mData->mUrlLabel->setVisible( false );
- mData->mIconButton->setVisible( true );
- mData->mIconButton->setEnabled( false );
+ flags = FavoriteVisible;
}
+
+ setFlags( flags );
}
/*!
@@ -290,7 +378,7 @@
*/
void RadioCarouselItem::setIconOpacity( qreal opacity )
{
- mData->mIconButton->setOpacity( opacity );
+ mFavoriteItem->setOpacity( opacity );
}
/*!
@@ -298,57 +386,18 @@
*/
void RadioCarouselItem::updateFavoriteIcon( bool isFavorite )
{
- if ( !mData->mSeekLayout ) {
- if ( isFavorite ) {
- mData->mIconButton->setIcon( mCarousel.favoriteIcon() );
- } else {
- mData->mIconButton->setIcon( mCarousel.nonFavoriteIcon() );
- }
+ if ( isFavorite ) {
+ mFavoriteItem->setIcon( mObserver.favoriteIcon() );
} else {
- mData->mIconButton->setIcon( HbIcon( "" ) );
+ mFavoriteItem->setIcon( mObserver.nonFavoriteIcon() );
}
}
/*!
*
*/
-QString RadioCarouselItem::parseFrequency( const uint frequency )
+void RadioCarouselItem::updateLayout()
{
- QString loc = "%L1 MHz";// hbTrId( "txt_rad_list_l1_mhz_big" );
- return loc.arg( RadioStation::parseFrequency( frequency ) );
+ setAppearance( mStation->hasName() || mStation->hasRadiotext() || mStation->hasUrl() ? Full : Default );
}
-/*!
- *
- */
-QString RadioCarouselItem::nameOrFrequency( const RadioStation& station, uint frequency )
-{
- if ( frequency == 0 ) {
- frequency = station.frequency();
- }
-
- QString text = "";
- if ( station.isValid() && !station.name().isEmpty() ) {
- text = station.name();
- } else {
- text = parseFrequency( frequency );
- }
-
- return text;
-}
-
-/*!
- *
- */
-RadioCarouselItem::Data::Data() :
- mLayout( NULL ),
- mSeekLayout( false )
-{
-}
-
-/*!
- *
- */
-RadioCarouselItem::Data::~Data()
-{
-}
--- a/radioapp/radiowidgets/src/radiofrequencyscanner.cpp Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radiowidgets/src/radiofrequencyscanner.cpp Fri Jun 25 19:09:05 2010 +0300
@@ -100,15 +100,15 @@
} else {
RadioUtil::setScanStatus( Scan::ScanningInStationsView );
mScanningProgressNote = new HbProgressDialog( HbProgressDialog::ProgressDialog );
- mScanningProgressNote->setModal( true );
- mScanningProgressNote->setAutoClose( true );
+ mScanningProgressNote.data()->setModal( true );
+ mScanningProgressNote.data()->setAutoClose( true );
// Add some extra to the maximum value to allow room for the station at the low band edge
- mScanningProgressNote->setRange( mUiEngine.minFrequency(), mUiEngine.maxFrequency() + EXTRA_TO_PROGRESS_MAX_VALUE );
- mScanningProgressNote->setProgressValue( mUiEngine.minFrequency() );
- mScanningProgressNote->setText( hbTrId( "txt_rad_info_searching_local_stations_please_wait" ) );
- mScanningProgressNote->setAttribute( Qt::WA_DeleteOnClose, true );
- mScanningProgressNote->open();
+ mScanningProgressNote.data()->setRange( mUiEngine.minFrequency(), mUiEngine.maxFrequency() + EXTRA_TO_PROGRESS_MAX_VALUE );
+ mScanningProgressNote.data()->setProgressValue( mUiEngine.minFrequency() );
+ mScanningProgressNote.data()->setText( hbTrId( "txt_rad_info_searching_local_stations_please_wait" ) );
+ mScanningProgressNote.data()->setAttribute( Qt::WA_DeleteOnClose, true );
+ mScanningProgressNote.data()->open();
Radio::connect( mScanningProgressNote.data(), SIGNAL(cancelled()),
this, SLOT(cancelScanning()) );
@@ -170,7 +170,7 @@
// all of the higher frequencies. We don't update the progress value here because the value would
// be lower than the previous one. The progress value is set to maximum when the scanner finishes.
if ( frequency != mUiEngine.minFrequency() ) {
- mScanningProgressNote->setProgressValue( frequency );
+ mScanningProgressNote.data()->setProgressValue( frequency );
}
mScannerEngine->continueScanning();
@@ -235,6 +235,8 @@
this, SLOT(restoreUiControls()) );
const uint frequency = model.stationAt( 0 ).frequency();
+
+ mUiEngine.setFrequency( frequency, TuneReason::StationScanFinalize );
frequencyStrip->setFrequency( frequency, TuneReason::StationScanFinalize, Scroll::Right );
carousel->setFrequency( frequency, TuneReason::StationScanFinalize, Scroll::Right );
@@ -260,8 +262,8 @@
} else {
if ( !mUserCanceled ) {
if ( mScanningProgressNote ) {
- mScanningProgressNote->setProgressValue( mScanningProgressNote->maximum() );
- mScanningProgressNote->close();
+ mScanningProgressNote.data()->setProgressValue( mScanningProgressNote.data()->maximum() );
+ mScanningProgressNote.data()->close();
}
if ( stationCount == 0 ) {
@@ -273,6 +275,8 @@
box->open();
}
}
+ const uint frequency = model.stationAt( 0 ).frequency();
+ mUiEngine.setFrequency( frequency, TuneReason::StationScanFinalize );
}
mIsAlive = false;
--- a/radioapp/radiowidgets/src/radiofrequencystrip.cpp Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radiowidgets/src/radiofrequencystrip.cpp Fri Jun 25 19:09:05 2010 +0300
@@ -25,6 +25,7 @@
#include <HbColorScheme>
#include <HbEvent>
#include <HbSwipeGesture>
+#include <HbDeviceProfile>
#include "radiofrequencystrip.h"
#include "radiofrequencyitem.h"
@@ -36,8 +37,8 @@
#include "radiologger.h"
// Frequency lines
-const int TAB_HEIGHT_SMALL = 10;
-const int TAB_HEIGHT_BIG = 15;
+const int TAB_HEIGHT_SMALL = 12;
+const int TAB_HEIGHT_BIG = 18;
const int PEN_WIDTH_FAVORITE = 4;
const qreal INDICATOR_WIDTH = 2.0;
@@ -52,7 +53,6 @@
const qreal PIXMAP_OVERLAP = qreal( ONE_TAB_DISTANCE ) / 2;
const int ITEM_WIDTH = ONE_TAB_DISTANCE * 5;
const int PIXMAP_WIDTH = ITEM_WIDTH + (int)PIXMAP_OVERLAP;
-const int STRIP_HEIGHT = 50;
const uint ONE_HUNDRED_KHZ = 100000;
@@ -84,17 +84,10 @@
/*!
*
*/
-static QLineF makeTab( qreal pos, int height )
-{
- return QLineF( pos, STRIP_HEIGHT - height, pos, STRIP_HEIGHT );
-}
-
-/*!
- *
- */
RadioFrequencyStrip::RadioFrequencyStrip() :
RadioStripBase(),
mUiEngine( NULL ),
+ mItemHeight( 8 ),
mMinFrequency( 87500000 ),
mMaxFrequency( 108000000 ),
mFrequencyStepSize( 100000 ),
@@ -114,18 +107,24 @@
RadioUtil::setFrequencyStrip( this );
setScrollingStyle( HbScrollArea::PanWithFollowOn );
- setItemSize( QSizeF( ITEM_WIDTH + PIXMAP_OVERLAP / 2, STRIP_HEIGHT ) );
+ setItemSize( QSizeF( ITEM_WIDTH + PIXMAP_OVERLAP / 2, mItemHeight ) );
setOverlap( PIXMAP_OVERLAP / 2 );
-
- initModel();
+}
- initSelector();
-
- initEmptyItems();
+/*!
+ * Property
+ */
+void RadioFrequencyStrip::setItemHeight( int itemHeight )
+{
+ mItemHeight = itemHeight;
+}
- initPositions();
-
- mFrequency = RadioUiEngine::lastTunedFrequency();
+/*!
+ * Property
+ */
+int RadioFrequencyStrip::itemHeight() const
+{
+ return mItemHeight;
}
/*!
@@ -137,6 +136,14 @@
mMinFrequency = mUiEngine->minFrequency();
mMaxFrequency = mUiEngine->maxFrequency();
mFrequencyStepSize = mUiEngine->frequencyStepSize();
+ mFrequency = RadioUiEngine::lastTunedFrequency();
+
+ initModel();
+ initEmptyItems();
+ initPositions();
+
+ HbDeviceProfile deviceProfile;
+ mItemHeight = static_cast<int>( mItemHeight * deviceProfile.unitValue() );
mLeftButton = uiLoader.findWidget<HbPushButton>( DOCML::MV_NAME_PREV_BUTTON );
mRightButton = uiLoader.findWidget<HbPushButton>( DOCML::MV_NAME_NEXT_BUTTON );
@@ -336,9 +343,11 @@
emit manualSeekChanged( mManualSeekMode );
if ( mManualSeekMode ) {
+ grabMouse();
hideButtons();
mManualSeekTimerId = startTimer( MANUALSEEK_SIGNAL_DELAY );
} else {
+ ungrabMouse();
showButtons();
killTimer( mManualSeekTimerId );
mManualSeekTimerId = 0;
@@ -389,10 +398,8 @@
/*!
* \reimp
*/
-void RadioFrequencyStrip::scrollPosChanged( QPointF newPosition )
+void RadioFrequencyStrip::scrollPosChanged()
{
- Q_UNUSED( newPosition );
-
if ( mManualSeekMode ) {
const int pos = selectorPos();
const uint frequency = mPositions.value( pos );
@@ -408,9 +415,11 @@
*/
void RadioFrequencyStrip::resizeEvent ( QGraphicsSceneResizeEvent* event )
{
- LOG_METHOD_ENTER;
+ LOG_METHOD;
RadioStripBase::resizeEvent( event );
+ initSelector();
+
const qreal height = event->newSize().height();
const qreal width = event->newSize().width();
@@ -457,7 +466,12 @@
RadioStripBase::mousePressEvent( event );
mManualSeekTimer->stop();
- if ( !mManualSeekMode ) {
+ if ( mManualSeekMode ) {
+ const bool insideStrip = rect().contains( event->pos() );
+ if ( !insideStrip ) {
+ toggleManualSeek();
+ }
+ } else {
mManualSeekTimer->start( MANUALSEEK_START_TIMEOUT );
}
}
@@ -540,7 +554,7 @@
*/
void RadioFrequencyStrip::initSelector()
{
- QPixmap selectorPixmap = QPixmap( QSize( SELECTOR_WIDTH, STRIP_HEIGHT ) );
+ QPixmap selectorPixmap = QPixmap( QSize( SELECTOR_WIDTH, (int)size().height() ) );
selectorPixmap.fill( Qt::red );
mSelectorImage->setPixmap( selectorPixmap );
mSelectorImage->setZValue( SELECTOR_Z_POS );
@@ -671,7 +685,7 @@
*/
QPixmap RadioFrequencyStrip::drawPixmap( uint frequency, QList<RadioStation> stations, RadioFrequencyItem* item )
{
- QPixmap pixmap( PIXMAP_WIDTH, STRIP_HEIGHT );
+ QPixmap pixmap( PIXMAP_WIDTH, mItemHeight );
pixmap.fill( Qt::transparent );
QPainter painter( &pixmap );
QPen normalPen = painter.pen();
@@ -680,8 +694,8 @@
painter.setPen( normalPen );
if ( frequency == 0 ) {
- painter.drawLine( makeTab( mSeparatorPos - 1 + ROUNDER, STRIP_HEIGHT ) );
- painter.drawLine( makeTab( mSeparatorPos + ROUNDER, STRIP_HEIGHT ) );
+ painter.drawLine( makeTab( mSeparatorPos - 1 + ROUNDER, mItemHeight ) );
+ painter.drawLine( makeTab( mSeparatorPos + ROUNDER, mItemHeight ) );
return pixmap;
}
@@ -705,7 +719,11 @@
if ( frequency % ONE_HERTZ == 0 ) {
// Draw the high frequency tab and the frequency text for the even number
- painter.drawLine( makeTab( pixels + leftOverlap, TAB_HEIGHT_BIG ) );
+ normalPen.setWidth( 3 );
+ painter.setPen( normalPen );
+ painter.drawLine( makeTab( pixels + leftOverlap - 1, TAB_HEIGHT_BIG ) );
+ normalPen.setWidth( 1 );
+ painter.setPen( normalPen );
// Draw the frequency text and its 00 decimals
painter.setFont( DECIMAL_FONT );
@@ -731,7 +749,7 @@
// Draw favorites and local stations
favoritePen.setColor( Qt::yellow );
- const int markerYPos = STRIP_HEIGHT - 20;
+ const int markerYPos = mItemHeight - 28;
foreach ( const RadioStation& station, stations ) {
const uint frequency = station.frequency();
pixels = qreal( frequency - startFrequency ) / PIXEL_IN_HZ;
@@ -740,7 +758,6 @@
favoritePen.setWidth( PEN_WIDTH_FAVORITE );
painter.setPen( favoritePen );
painter.drawEllipse( int( pixels + leftOverlap - 3 ), markerYPos - 3, 6, 6 );
-// painter.drawPixmap( pixels - 10, 20, 20, 20, mFavoriteIcon.pixmap() );
} else if ( station.isType( RadioStation::LocalStation ) ) {
favoritePen.setWidth( 1 );
@@ -755,6 +772,14 @@
/*!
*
*/
+QLineF RadioFrequencyStrip::makeTab( qreal pos, int height )
+{
+ return QLineF( pos, mItemHeight - height, pos, mItemHeight );
+}
+
+/*!
+ *
+ */
void RadioFrequencyStrip::emitFrequencyChanged( uint frequency )
{
if ( frequency > 0 && frequency != mFrequency ) {
--- a/radioapp/radiowidgets/src/radiohistoryview.cpp Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radiowidgets/src/radiohistoryview.cpp Fri Jun 25 19:09:05 2010 +0300
@@ -217,8 +217,6 @@
*/
void RadioHistoryView::openOtherStore()
{
- QString msg = "To be implemented: Open other store. Artist: %1, Title: %2";
- HbMessageBox::information( msg.arg( mSelectedItem->artist() ).arg( mSelectedItem->title() ) );
mUiEngine->openMusicStore( *mSelectedItem, RadioUiEngine::OtherStore );
}
@@ -253,6 +251,7 @@
void RadioHistoryView::init()
{
LOG_METHOD;
+ loadSection( DOCML::FILE_HISTORYVIEW, DOCML::SECTION_LAZY_LOAD );
RadioHistoryModel* historyModel = &mUiEngine->historyModel();
historyModel->setShowDetails( mOrientation == Qt::Horizontal );
@@ -294,6 +293,8 @@
this, SLOT(toggleTagging()) );
connectXmlElement( DOCML::HV_NAME_OVI_STORE_ACTION, SIGNAL(triggered()),
this, SLOT(openOviStore()) );
+ connectXmlElement( DOCML::HV_NAME_OTHER_STORE_ACTION, SIGNAL(triggered()),
+ this, SLOT(openOtherStore()) );
initBackAction();
updateViewMode();
--- a/radioapp/radiowidgets/src/radiomainview.cpp Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radiowidgets/src/radiomainview.cpp Fri Jun 25 19:09:05 2010 +0300
@@ -17,11 +17,14 @@
// System includes
#include <QTimer>
-#include <HbLabel>
#include <HbPushButton>
#include <HbAction>
#include <HbMenu>
-#include <QApplication>
+#include <HbApplication>
+#include <HbActivityManager>
+#include <QPixmap>
+#include <HbLabel>
+#include <HbFrameItem> // Temporarily here until docml supports frame items
// User includes
#include "radiowindow.h"
@@ -36,6 +39,22 @@
#include "radiofrequencyscanner.h"
// Constants
+const QLatin1String RADIO_MAINVIEW_ACTIVITY_ID( "FMRadioMainView" );
+
+/*!
+ * Temporary convenience function to set frame background until DOCML supports frame items
+ */
+static void initFrameBackground( RadioUiLoader& uiLoader,
+ const QString backgroundName,
+ HbFrameDrawer::FrameType frameType )
+{
+ if ( HbLabel* backgroundLabel = uiLoader.findObject<HbLabel>( backgroundName ) ) {
+ QString backgroundName = backgroundLabel->icon().iconName();
+ HbFrameItem* frameItem = new HbFrameItem( backgroundName, frameType, backgroundLabel );
+ backgroundLabel->setBackgroundItem( frameItem );
+ }
+}
+
/*!
*
@@ -66,9 +85,11 @@
loadSection( DOCML::FILE_MAINVIEW, DOCML::MV_SECTION_SCANNING );
} else {
loadSection( DOCML::FILE_MAINVIEW, DOCML::MV_SECTION_NORMAL );
+ updateFavoriteButton();
mFrequencyScanner.take();
- const bool firsTimeStart = mUiEngine->isFirstTimeStart();
+// const bool firsTimeStart = mUiEngine->isFirstTimeStart();
+ const bool firsTimeStart = false; // TODO! RadioServer terminates. Fix available in NCP 25 or 27.
const int rowCount = mUiEngine->stationModel().rowCount();
if ( firsTimeStart && rowCount != 0 ) {
mUiEngine->setFirstTimeStartPerformed( true );
@@ -80,14 +101,26 @@
* \reimp
*
*/
+void RadioMainView::preLazyLoadInit()
+{
+ initFrameBackground( *mUiLoader, DOCML::MV_NAME_FREQUENCY_BACKGROUND, HbFrameDrawer::NinePieces );
+
+ initFrameBackground( *mUiLoader, DOCML::MV_NAME_CAROUSEL_BACKGROUND, HbFrameDrawer::NinePieces );
+}
+
+/*!
+ * \reimp
+ *
+ */
void RadioMainView::init()
{
LOG_METHOD;
loadSection( DOCML::FILE_MAINVIEW, DOCML::SECTION_LAZY_LOAD );
+ initFrameBackground( *mUiLoader, DOCML::MV_NAME_CAROUSEL_OVERLAY, HbFrameDrawer::NinePieces );
+
mCarousel = mUiLoader->findObject<RadioStationCarousel>( DOCML::MV_NAME_STATION_CAROUSEL );
mCarousel->init( *mUiLoader, mUiEngine.data() );
- // Note! UI connections are already made in the DocML file. Here we need to connect UI to engine
mFrequencyStrip = mUiLoader->findObject<RadioFrequencyStrip>( DOCML::MV_NAME_FREQUENCY_STRIP );
mFrequencyStrip->init( mUiEngine.data(), *mUiLoader );
@@ -122,12 +155,17 @@
connectXmlElement( DOCML::MV_NAME_STATIONS_BUTTON, SIGNAL(clicked()),
mMainWindow, SLOT(activateStationsView()) );
- connectXmlElement( DOCML::MV_NAME_SCAN_BUTTON, SIGNAL(clicked()),
- this, SLOT(toggleScanning()) );
+ connectXmlElement( DOCML::MV_NAME_FAVORITE_BUTTON, SIGNAL(clicked()),
+ this, SLOT(toggleFavorite()) );
connectXmlElement( DOCML::MV_NAME_SPEAKER_BUTTON, SIGNAL(clicked()),
mUiEngine.data(), SLOT(toggleAudioRoute()) );
+ connectXmlElement( DOCML::MV_NAME_SCAN_ACTION, SIGNAL(triggered()),
+ this, SLOT(toggleScanning()) );
+
+ updateFavoriteButton();
+
connectCommonMenuItem( MenuItem::Exit );
// "Play history" menu item
@@ -135,7 +173,7 @@
//TODO: REMOVE. THIS IS TEMPORARY TEST CODE
toggleSkippingMode();
- menu()->addAction( "Reset start count", this, SLOT(resetFirstTimeCount()) );
+ menu()->addAction( "-- Reset start count", this, SLOT(resetFirstTimeCount()) );
// END TEMPORARY TEST CODE
updateAudioRoute( mUiEngine->isUsingLoudspeaker() );
@@ -151,12 +189,16 @@
#endif // BUILD_WIN32
setNavigationAction( backAction );
- const bool firsTimeStart = mUiEngine->isFirstTimeStart();
+// const bool firsTimeStart = mUiEngine->isFirstTimeStart();
+ const bool firsTimeStart = false; // TODO! RadioServer terminates. Fix available in NCP 25 or 27.
const int rowCount = mUiEngine->stationModel().rowCount();
if ( firsTimeStart && rowCount == 0 ){
QTimer::singleShot( 100, this, SLOT(toggleScanning()) );
}
+ Radio::connect( static_cast<HbApplication*>( qApp ), SIGNAL(aboutToQuit()),
+ this, SLOT(saveActivity()) );
+
emit applicationReady();
}
@@ -223,8 +265,9 @@
void RadioMainView::setFrequencyFromEngine( uint frequency, int reason )
{
LOG_FORMAT( "RadioMainView::setFrequencyFromEngine reason: %d", reason );
- if ( !RadioUtil::isScannerAlive() && !mFrequencyStrip->isInManualSeekMode() ) {
+ if ( RadioUtil::scanStatus() != Scan::ScanningInMainView && !mFrequencyStrip->isInManualSeekMode() ) {
mCarousel->clearInfoText();
+ updateFavoriteButton();
if ( reason != TuneReason::FrequencyStrip &&
reason != TuneReason::StationCarousel &&
reason != TuneReason::Skip ) {
@@ -304,6 +347,18 @@
/*!
* Private slot
*/
+void RadioMainView::toggleFavorite()
+{
+ if ( RadioUtil::isScannerAlive() ) {
+ toggleScanning();
+ } else {
+ mUiEngine->stationModel().setData( QModelIndex(), mFrequencyStrip->frequency(), RadioRole::ToggleFavoriteRole );
+ }
+}
+
+/*!
+ * Private slot
+ */
void RadioMainView::seekingStarted()
{
if ( !RadioUtil::isScannerAlive() ) {
@@ -320,8 +375,8 @@
mFrequencyStrip->cancelManualSeek();
}
- HbPushButton* scanButton = mUiLoader->findWidget<HbPushButton>( DOCML::MV_NAME_SCAN_BUTTON );
- scanButton->setEnabled( connected );
+ HbAction* scanAction = mUiLoader->findObject<HbAction>( DOCML::MV_NAME_SCAN_ACTION );
+ scanAction->setEnabled( connected );
mCarousel->updateAntennaStatus( connected );
}
@@ -347,8 +402,12 @@
{
if ( manualSeekActive ) {
qApp->installEventFilter( this );
+
+ mUiLoader->findWidget<HbPushButton>( DOCML::MV_NAME_FAVORITE_BUTTON )->setText( hbTrId( "txt_rad_button_add_to_favourites" ) );
} else {
qApp->removeEventFilter( this );
+
+ updateFavoriteButton();
}
mUiEngine->setManualSeekMode( manualSeekActive );
@@ -362,11 +421,43 @@
void RadioMainView::handleFavoriteChange( const RadioStation& station )
{
mFrequencyStrip->updateFavorite( station );
- if ( station.isFavorite() ) {
- RadioUtil::showDiscreetNote( "Station added to Favourites." );
- } else {
- RadioUtil::showDiscreetNote( "Station removed from Favourites." );
- }
+ updateFavoriteButton();
+}
+
+/*!
+ * Private slot
+ */
+void RadioMainView::saveActivity()
+{
+ HbActivityManager* activityManager = qobject_cast<HbApplication*>(qApp)->activityManager();
+
+ // Get a screenshot for saving to the activity manager
+ QSize screenShotSize = mCarousel->size().toSize();
+ QPixmap screenShot( screenShotSize );
+ QPainter painter( &screenShot );
+
+ // Draw the background and overlay
+ HbLabel* backgroundLabel = mUiLoader->findWidget<HbLabel>( DOCML::MV_NAME_CAROUSEL_BACKGROUND );
+ painter.drawPixmap( 0, 0, backgroundLabel->icon().pixmap().scaled( screenShotSize ) );
+ backgroundLabel = mUiLoader->findWidget<HbLabel>( DOCML::MV_NAME_CAROUSEL_OVERLAY );
+ painter.drawPixmap( 0, 0, backgroundLabel->icon().pixmap().scaled( screenShotSize ) );
+
+ mCarousel->drawOffScreen( painter );
+
+ QVariantHash metadata;
+ metadata.insert( "screenshot", screenShot );
+
+ #ifdef __WINS__
+ screenShot.save( "c:\\radio.bmp" );
+ #elif defined BUILD_WIN32
+ screenShot.save( "radio.bmp" );
+ #endif
+
+ // Update the activity to the activity manager
+ bool ok = activityManager->removeActivity( RADIO_MAINVIEW_ACTIVITY_ID );
+ LOG_ASSERT( ok, LOG( "Failed to remove old activity from Activity Manager!" ) );
+ ok = activityManager->addActivity( RADIO_MAINVIEW_ACTIVITY_ID, QVariant(), metadata );
+ LOG_ASSERT( ok, LOG( "Failed to update activity to Activity Manager!" ) );
}
/*!
@@ -381,9 +472,9 @@
mAlternateSkipping = !mAlternateSkipping;
mCarousel->setAlternateSkippingMode( mAlternateSkipping );
if ( mAlternateSkipping ) {
- mSkippingAction->setText( "Normal skipping mode" );
+ mSkippingAction->setText( "-- Normal skipping mode" );
} else {
- mSkippingAction->setText( "Alternate skipping mode" );
+ mSkippingAction->setText( "-- Alternate skipping mode" );
}
}
@@ -394,3 +485,21 @@
{
mUiEngine->setFirstTimeStartPerformed( false );
}
+
+/*!
+ *
+ */
+void RadioMainView::updateFavoriteButton()
+{
+ RadioStation station;
+ RadioStationModel& model = mUiEngine->stationModel();
+ model.findFrequency( mUiEngine->currentFrequency(), station );
+ HbPushButton* favoriteButton = mUiLoader->findWidget<HbPushButton>( DOCML::MV_NAME_FAVORITE_BUTTON );
+ if ( station.isFavorite() ) {
+ favoriteButton->setText( hbTrId( "txt_fmradio_button_remove_from_favourites" ) );
+ favoriteButton->setIcon( HbIcon( "qtg_mono_favourites_remove" ) );
+ } else {
+ favoriteButton->setText( hbTrId( "txt_rad_button_add_to_favourites" ) );
+ favoriteButton->setIcon( HbIcon( "qtg_mono_add_to_favourites" ) );
+ }
+}
--- a/radioapp/radiowidgets/src/radiostationcarousel.cpp Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radiowidgets/src/radiostationcarousel.cpp Fri Jun 25 19:09:05 2010 +0300
@@ -22,6 +22,8 @@
#include <HbPanGesture>
#include <HbSwipeGesture>
#include <HbFontSpec>
+#include <HbMenu>
+#include <QPainter>
// User includes
#include "radiostationcarousel.h"
@@ -43,6 +45,11 @@
const int FAVORITE_HINT_SHOW_DELAY = 1000;
const int FAVORITE_HINT_HIDE_DELAY = 2000;
+// Matti testing constants
+const QLatin1String LEFT_ITEM_NAME ( "carousel_left" );
+const QLatin1String CENTER_ITEM_NAME ( "carousel_center" );
+const QLatin1String RIGHT_ITEM_NAME ( "carousel_right" );
+
#ifdef BUILD_WIN32
# define SCROLLBAR_POLICY ScrollBarAlwaysOn
#else
@@ -63,8 +70,8 @@
mAutoScrollTime( 300 ),
mGenericTimer( new QTimer( this ) ),
mTimerMode( NoTimer ),
- mAnimator( NULL ),
mInfoText( NULL ),
+ mRadiotextPopup( NULL ),
mContainer( new HbWidget( this ) ),
mMidScrollPos( 0 ),
mMaxScrollPos( 0 ),
@@ -143,9 +150,14 @@
mUiEngine = uiEngine;
RadioUtil::setCarousel( this );
- mItems[LeftItem] = new RadioCarouselItem( *this );
- mItems[CenterItem] = new RadioCarouselItem( *this );
- mItems[RightItem] = new RadioCarouselItem( *this );
+ mItems[CenterItem] = new RadioCarouselItem( *this, this, true );
+ mItems[LeftItem] = new RadioCarouselItem( *this, this );
+ mItems[RightItem] = new RadioCarouselItem( *this, this );
+
+ // Matti testing needs the objects to have names
+ mItems[LeftItem]->setObjectName( LEFT_ITEM_NAME );
+ mItems[CenterItem]->setObjectName( CENTER_ITEM_NAME );
+ mItems[RightItem]->setObjectName( RIGHT_ITEM_NAME );
QGraphicsLinearLayout* layout = new QGraphicsLinearLayout( Qt::Horizontal );
layout->setContentsMargins( 0, 0, 0, 0 );
@@ -166,6 +178,8 @@
mInfoText = uiLoader.findWidget<HbLabel>( DOCML::MV_NAME_INFO_TEXT );
mInfoText->setTextWrapping( Hb::TextWordWrap );
+ mRadiotextPopup = uiLoader.findObject<HbMenu>( DOCML::MV_NAME_CAROUSEL_RT_MENU );
+
#ifdef BUILD_WIN32
HbFontSpec spec = mInfoText->fontSpec();
spec.setRole( HbFontSpec::Secondary );
@@ -173,10 +187,7 @@
#endif
setScrollDirections( Qt::Horizontal );
-// grabGesture( Qt::SwipeGesture );
-// Radio::connect( this, SIGNAL(scrollPositionChanged(QPointF)),
-// this, SLOT(scrollPosChanged(QPointF)) );
Radio::connect( this, SIGNAL(scrollingEnded()),
this, SLOT(adjustAfterScroll()) );
@@ -290,10 +301,10 @@
if ( !mAnimator ) {
mAnimator = new RadioCarouselAnimator( *this );
}
- mAnimator->startFlashingText();
+ mAnimator.data()->startFlashingText();
} else {
if ( mAnimator ) {
- mAnimator->stopFlashingText();
+ mAnimator.data()->stopFlashingText();
}
clearInfoText();
setCenterIndex( 0 );
@@ -331,7 +342,7 @@
mItems[RightItem]->setFrequency( previousFrequency );
mCurrentIndex = mModel->indexFromFrequency( station.frequency() );
- mAnimator->startNumberScroll( previousFrequency, station.frequency() );
+ mAnimator.data()->startNumberScroll( previousFrequency, station.frequency() );
}
}
@@ -341,7 +352,7 @@
void RadioStationCarousel::cancelAnimation()
{
if ( mAnimator ) {
- mAnimator->stopAll();
+ mAnimator.data()->stopAll();
}
}
@@ -364,7 +375,7 @@
if ( !mAnimator ) {
mAnimator = new RadioCarouselAnimator( *this );
}
- mAnimator->startFlashingIcon();
+ mAnimator.data()->startFlashingIcon();
} else if ( type == CarouselInfoText::ConnectAntenna ) {
cleanRdsData();
@@ -393,7 +404,7 @@
{
if ( mInfoTextType != CarouselInfoText::None ) {
if ( mAnimator ) {
- mAnimator->stopFlashingIcon();
+ mAnimator.data()->stopFlashingIcon();
}
mGenericTimer->stop();
@@ -422,6 +433,14 @@
}
/*!
+ *
+ */
+void RadioStationCarousel::drawOffScreen( QPainter& painter )
+{
+ mItems[CenterItem]->drawOffScreen( painter );
+}
+
+/*!
* TODO: Remove this! This is test code
*/
void RadioStationCarousel::setAlternateSkippingMode( bool alternateSkipping )
@@ -525,26 +544,6 @@
}
}
-/*!
- * Private slot
- */
-void RadioStationCarousel::toggleFavorite()
-{
- if ( mModel ) {
- mModel->setData( QModelIndex(), mItems[CenterItem]->frequency(), RadioRole::ToggleFavoriteRole );
- }
-}
-
-/*!
- * Private slot
- */
-//void RadioStationCarousel::openContextMenu( HbAbstractViewItem* item, const QPointF& coords )
-//{
-// if ( item ) {
-// static_cast<RadioStationItem*>( item )->handleLongPress( coords );
-// }
-//}
-
#ifdef USE_DEBUGGING_CONTROLS
/*!
* Public slot
@@ -644,6 +643,57 @@
}
/*!
+ * \reimp
+ */
+void RadioStationCarousel::handleIconClicked( const RadioStation& station )
+{
+ if ( mModel ) {
+ mModel->setData( QModelIndex(), station.frequency(), RadioRole::ToggleFavoriteRole );
+ }
+}
+
+/*!
+ * \reimp
+ */
+void RadioStationCarousel::handleRadiotextClicked( const RadioStation& station )
+{
+ Q_UNUSED( station );
+ mRadiotextPopup->show();
+}
+
+/*!
+ * \reimp
+ */
+void RadioStationCarousel::handleUrlClicked( const RadioStation& station )
+{
+ mUiEngine->launchBrowser( station.url() );
+}
+
+/*!
+ * \reimp
+ */
+QString RadioStationCarousel::localizeGenre( int genre )
+{
+ return mUiEngine->genreToString( genre, GenreTarget::Carousel );
+}
+
+/*!
+ * \reimp
+ */
+bool RadioStationCarousel::isInManualSeek() const
+{
+ return mManualSeekMode;
+}
+
+/*!
+ *
+ */
+RadioStation RadioStationCarousel::findStation( uint frequency )
+{
+ return mModel->findStation( frequency, FindCriteria::IncludeManualStation );
+}
+
+/*!
*
*/
bool RadioStationCarousel::isInitialized() const
--- a/radioapp/radiowidgets/src/radiostationsview.cpp Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radiowidgets/src/radiostationsview.cpp Fri Jun 25 19:09:05 2010 +0300
@@ -119,12 +119,21 @@
*mSelectedStation = mFilterModel->data( item->modelIndex(), RadioRole::RadioStationRole ).value<RadioStation>();
HbAction* favoriteAction = mUiLoader->findObject<HbAction>( DOCML::NAME_CONTEXT_FAVORITE );
+
if ( mSelectedStation->isFavorite() ) {
favoriteAction->setText( hbTrId( "txt_rad_menu_remove_favourite" ) );
} else {
favoriteAction->setText( hbTrId( "txt_rad_menu_add_to_favourites" ) );
}
+ HbAction* playAction = mUiLoader->findObject<HbAction>( DOCML::SV_NAME_PLAY_ACTION );
+
+ if ( mSelectedStation->frequency() == mUiEngine->currentFrequency() ) {
+ playAction->setVisible( false );
+ } else {
+ playAction->setVisible( true );
+ }
+
menu->setPreferredPos( QPointF( size().width() / 2 - menu->size().width() / 2, coords.y() - menu->size().height() / 2 ) );
menu->show();
}
@@ -224,6 +233,16 @@
* Private slot
*
*/
+void RadioStationsView::play()
+{
+ LOG("Play from context menu");
+ mUiEngine->setFrequency( mSelectedStation->frequency(), TuneReason::StationsList );
+}
+
+/*!
+ * Private slot
+ *
+ */
void RadioStationsView::rename()
{
HbInputDialog* nameQuery = new HbInputDialog();
@@ -315,6 +334,8 @@
this, SLOT(startScanning()) );
// Context menu actions
+ connectXmlElement( DOCML::SV_NAME_PLAY_ACTION, SIGNAL(triggered()),
+ this, SLOT(play()) );
connectXmlElement( DOCML::SV_NAME_RENAME_ACTION, SIGNAL(triggered()),
this, SLOT(rename()) );
connectXmlElement( DOCML::SV_NAME_FAVORITE_ACTION, SIGNAL(triggered()),
@@ -358,7 +379,7 @@
mModel->removeAll( favoriteMode ? RadioStationModel::RemoveFavorites : RadioStationModel::RemoveAll );
updateVisibilities();
} else if ( mCurrentQuestion == DeleteStation ) {
- mModel->removeStation( mModel->currentStation() );
+ mModel->removeStation( *mSelectedStation );
}
mCurrentQuestion = NoQuestion;
--- a/radioapp/radiowidgets/src/radiostripbase.cpp Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radiowidgets/src/radiostripbase.cpp Fri Jun 25 19:09:05 2010 +0300
@@ -53,9 +53,6 @@
// mItemParent is used to hold the unused QGraphicsItem's in the pool. It's visibility is set to false
// so the visibility of the items doesn't need to be modified.
mItemPoolParent->setVisible( false );
-
- Radio::connect( this, SIGNAL(scrollPositionChanged(QPointF)),
- this, SLOT(scrollPositionChanged(QPointF)));
}
/*!
@@ -217,15 +214,6 @@
}
/*!
- * Private slot
- */
-void RadioStripBase::scrollPositionChanged( QPointF newPosition )
-{
- adjustItems();
- scrollPosChanged( newPosition );
-}
-
-/*!
*
*/
void RadioStripBase::moveAllItemsToPool()
@@ -280,11 +268,7 @@
}
}
- QRectF contentsRect(0,0,0,0);
- contentsRect.setBottom( mItemSize.height() );
- contentsRect.setRight( mContentsLength );
-
- mStripContainer->setGeometry( contentsRect );
+ mStripContainer->setPreferredSize( mContentsLength, mItemSize.height() );
if ( mCurrentIndex >= 0 )
{
@@ -497,3 +481,16 @@
}
}
}
+
+/*!
+ * \reimp
+ */
+bool RadioStripBase::scrollByAmount( const QPointF& delta )
+{
+ bool ret = HbScrollArea::scrollByAmount( delta );
+
+ adjustItems();
+ scrollPosChanged();
+
+ return ret;
+}
--- a/radioapp/radiowidgets/src/radioutil.cpp Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radiowidgets/src/radioutil.cpp Fri Jun 25 19:09:05 2010 +0300
@@ -53,9 +53,6 @@
bool allAvailable = true;
QEffectList added;
foreach ( EffectInfo info, list ) {
-#ifdef USE_LAYOUT_FROM_E_DRIVE
- info.mPath.replace( QString( ":/" ), QString( "e:/radiotest/" ) );
-#endif
if ( HbEffect::add( info.mItem, info.mPath, info.mEvent ) ) {
added.append( info );
} else {
@@ -79,7 +76,7 @@
*/
RadioFrequencyStrip* RadioUtil::frequencyStrip()
{
- return instance().mFrequencyStrip;
+ return instance().mFrequencyStrip.data();
}
/*!
@@ -87,7 +84,7 @@
*/
RadioStationCarousel* RadioUtil::carousel()
{
- return instance().mCarousel;
+ return instance().mCarousel.data();
}
/*!
@@ -95,7 +92,7 @@
*/
bool RadioUtil::isScannerAlive()
{
- RadioFrequencyScanner* scanner = instance().mScanner;
+ RadioFrequencyScanner* scanner = instance().mScanner.data();
if ( scanner ) {
return scanner->isAlive();
}
@@ -176,9 +173,9 @@
if ( !self.mNotificationDialog ) {
self.mNotificationDialog = new HbNotificationDialog();
}
- self.mNotificationDialog->setAttribute( Qt::WA_DeleteOnClose );
- self.mNotificationDialog->setTitle( text );
- self.mNotificationDialog->show();
+ self.mNotificationDialog.data()->setAttribute( Qt::WA_DeleteOnClose );
+ self.mNotificationDialog.data()->setTitle( text );
+ self.mNotificationDialog.data()->show();
}
/*!
--- a/radioapp/radiowidgets/src/radioviewbase.cpp Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radiowidgets/src/radioviewbase.cpp Fri Jun 25 19:09:05 2010 +0300
@@ -63,6 +63,14 @@
/*!
*
*/
+void RadioViewBase::preLazyLoadInit()
+{
+ // Default implementation does nothing
+}
+
+/*!
+ *
+ */
void RadioViewBase::initialize( QSharedPointer<RadioUiEngine> uiEngine )
{
mUiEngine = uiEngine;
--- a/radioapp/radiowidgets/src/radiowindow.cpp Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radiowidgets/src/radiowindow.cpp Fri Jun 25 19:09:05 2010 +0300
@@ -96,7 +96,7 @@
if ( !mMainView ) {
mMainView = ViewPtr( new RadioMainView() );
}
- activateView( mMainView, DOCML::FILE_MAINVIEW, Hb::ViewSwitchUseBackAnim );
+ activateView( mMainView.data(), DOCML::FILE_MAINVIEW, Hb::ViewSwitchUseBackAnim );
}
/*!
@@ -107,7 +107,7 @@
if ( !mStationsView ) {
mStationsView = ViewPtr( new RadioStationsView() );
}
- activateView( mStationsView, DOCML::FILE_STATIONSVIEW );
+ activateView( mStationsView.data(), DOCML::FILE_STATIONSVIEW );
}
/*!
@@ -118,7 +118,7 @@
if ( !mHistoryView ) {
mHistoryView = ViewPtr( new RadioHistoryView() );
}
- activateView( mHistoryView, DOCML::FILE_HISTORYVIEW );
+ activateView( mHistoryView.data(), DOCML::FILE_HISTORYVIEW );
}
/*!
@@ -272,6 +272,7 @@
}
aMember->setMembers( this, uiLoader.take() );
+ aMember->preLazyLoadInit();
addView( aMember );
}
--- a/radioapp/radiowidgetsplugin/radiowidgetsplugin.pro Fri Jun 11 13:38:32 2010 +0300
+++ b/radioapp/radiowidgetsplugin/radiowidgetsplugin.pro Fri Jun 25 19:09:05 2010 +0300
@@ -14,6 +14,7 @@
# Description:
#
+TMP_DIR_NAME = widgetsplugin
include(../buildflags.pri)
TEMPLATE = lib
--- a/radioengine/engine/group/radioengine.mmp Fri Jun 11 13:38:32 2010 +0300
+++ b/radioengine/engine/group/radioengine.mmp Fri Jun 25 19:09:05 2010 +0300
@@ -30,6 +30,7 @@
VENDORID VID_DEFAULT
PAGED
+SMPSAFE
SOURCEPATH ../src
SOURCE cradioengine.cpp
--- a/radioengine/engine/src/cradioengineimp.cpp Fri Jun 11 13:38:32 2010 +0300
+++ b/radioengine/engine/src/cradioengineimp.cpp Fri Jun 25 19:09:05 2010 +0300
@@ -1647,12 +1647,13 @@
if ( iSeekingState != RadioEngine::ERadioNotSeeking && iSettings->EngineSettings().IsPowerOn() )
{
// Reset seeking state to enable seeking start
+ LOG( "PowerOn event in seekingstate. Restart seeking" );
RadioEngine::TRadioSeeking oldSeeking = iSeekingState;
iSeekingState = RadioEngine::ERadioNotSeeking;
Seek( oldSeeking == RadioEngine::ERadioSeekingUp ? RadioEngine::ERadioUp : RadioEngine::ERadioDown );
}
- if ( !powerState != !aPowerOn )
+ if ( !powerState != !aPowerOn || aErrorCode )
{
NotifyRadioEvent( ERadioEventPower, aErrorCode );
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioengine/engine/stub/bwins/fmradioengine_stubu.def Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,4 @@
+EXPORTS
+ ??1CRadioEngine@@UAE@XZ @ 1 NONAME ; CRadioEngine::~CRadioEngine(void)
+ ?NewL@CRadioEngine@@SAPAV1@AAVMRadioEngineInitializer@@@Z @ 2 NONAME ; class CRadioEngine * CRadioEngine::NewL(class MRadioEngineInitializer &)
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioengine/engine/stub/eabi/fmradioengine_stubu.def Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,6 @@
+EXPORTS
+ _ZN12CRadioEngine4NewLER23MRadioEngineInitializer @ 1 NONAME
+ _ZN12CRadioEngineD0Ev @ 2 NONAME
+ _ZN12CRadioEngineD1Ev @ 3 NONAME
+ _ZN12CRadioEngineD2Ev @ 4 NONAME
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioengine/engine/stub/group/bld.inf Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,32 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+#include "../../../group/buildflags.hrh"
+
+#ifdef COMPILE_IN_WK48_ENV
+# include <domain/osextensions/platform_paths.hrh>
+#else
+# include <platform_paths.hrh>
+#endif // COMPILE_IN_WK48_ENV
+
+PRJ_PLATFORMS
+WINSCW ARMV5
+
+PRJ_EXPORTS
+
+PRJ_MMPFILES
+radioengine_stub.mmp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioengine/engine/stub/group/radioengine_stub.mmp Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,69 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+#include "../../../group/buildflags.hrh"
+
+#ifdef COMPILE_IN_IVALO
+# include <domain/osextensions/platform_paths.hrh>
+#else
+# include <platform_paths.hrh>
+#endif // COMPILE_IN_IVALO
+
+#include <data_caging_paths.hrh>
+
+TARGET fmradioengine_stub.dll
+TARGETTYPE DLL
+UID 0x1000008D 0x01000011
+VERSION 11.0
+
+CAPABILITY CAP_GENERAL_DLL
+VENDORID VID_DEFAULT
+
+PAGED
+SMPSAFE
+
+SOURCEPATH ../../src
+SOURCE cradioengine.cpp
+SOURCE cradioengineimp.cpp
+SOURCE cradiordsreceiver.cpp
+SOURCE cradiordsreceiverbase.cpp
+SOURCE cradionetworkinfolistener.cpp
+
+USERINCLUDE ../../api
+USERINCLUDE ../../inc
+USERINCLUDE ../../../utils/api
+USERINCLUDE ../../../settings/api
+USERINCLUDE ../../../group
+
+// Default system include paths for application layer modules.
+APP_LAYER_SYSTEMINCLUDE
+
+LIBRARY fmradioengineutils_stub.lib
+LIBRARY fmradioenginesettings_stub.lib
+
+LIBRARY audiooutputrouting.lib
+LIBRARY euser.lib
+LIBRARY efsrv.lib
+LIBRARY radio_utility_stub.lib
+LIBRARY cone.lib
+LIBRARY etel3rdparty.lib // For CTelephony
+LIBRARY etel.lib // For RTelServer
+LIBRARY etelmm.lib // For RMobilePhone
+LIBRARY commsdat.lib // For CommsDat
+LIBRARY timezonelocalization.lib // For CTzLocalizer
+LIBRARY bafl.lib // For CDesCArray
+LIBRARY centralrepository.lib
--- a/radioengine/group/bld.inf Fri Jun 11 13:38:32 2010 +0300
+++ b/radioengine/group/bld.inf Fri Jun 25 19:09:05 2010 +0300
@@ -15,6 +15,7 @@
*
*/
+PRJ_MMPFILES
#include "../utils/group/bld.inf"
#include "../settings/group/bld.inf"
#include "../engine/group/bld.inf"
--- a/radioengine/settings/api/cradioregion.h Fri Jun 11 13:38:32 2010 +0300
+++ b/radioengine/settings/api/cradioregion.h Fri Jun 25 19:09:05 2010 +0300
@@ -84,18 +84,6 @@
*/
IMPORT_C const RRadioCountryCodeArray& CountryCodes();
- /**
- * Name Get the name of region
- * @return Name of region
- */
- IMPORT_C const TDesC16& Name() const;
-
- /**
- * SettingItemName Get the name of region for setting item
- * @return Name of region
- */
- IMPORT_C const TDesC16& SettingItemName() const;
-
private:
CRadioRegion();
@@ -107,7 +95,7 @@
/** Id of the region*/
TRadioRegion iId;
/** Step interval*/
- TUint16 iStepSize;
+ TUint32 iStepSize;
/** Min frequency */
TUint32 iMinFreq;
/** Max frequency */
@@ -116,10 +104,6 @@
TInt iDecimalCount;
/** Country code*/
RRadioCountryCodeArray iCountryCodes;
- /** Region name*/
- HBufC* iName;
- /** Region name for setting item*/
- HBufC* iSettingName;
};
--- a/radioengine/settings/bwins/fmradioenginesettingsu.def Fri Jun 11 13:38:32 2010 +0300
+++ b/radioengine/settings/bwins/fmradioenginesettingsu.def Fri Jun 25 19:09:05 2010 +0300
@@ -1,12 +1,10 @@
EXPORTS
- ?Name@CRadioRegion@@QBEABVTDesC16@@XZ @ 1 NONAME ; class TDesC16 const & CRadioRegion::Name(void) const
- ?SettingItemName@CRadioRegion@@QBEABVTDesC16@@XZ @ 2 NONAME ; class TDesC16 const & CRadioRegion::SettingItemName(void) const
- ?Id@CRadioRegion@@QBE?AW4TRadioRegion@@XZ @ 3 NONAME ; enum TRadioRegion CRadioRegion::Id(void) const
+ ?Id@CRadioRegion@@QBE?AW4TRadioRegion@@XZ @ 1 NONAME ; enum TRadioRegion CRadioRegion::Id(void) const
+ ?NewL@CRadioSettings@@SAPAV1@XZ @ 2 NONAME ; class CRadioSettings * CRadioSettings::NewL(void)
+ ?StepSize@CRadioRegion@@QBEKXZ @ 3 NONAME ; unsigned long CRadioRegion::StepSize(void) const
?MaxFrequency@CRadioRegion@@QBEKXZ @ 4 NONAME ; unsigned long CRadioRegion::MaxFrequency(void) const
?DecimalCount@CRadioRegion@@QBEHXZ @ 5 NONAME ; int CRadioRegion::DecimalCount(void) const
??1CRadioSettings@@UAE@XZ @ 6 NONAME ; CRadioSettings::~CRadioSettings(void)
- ?NewL@CRadioSettings@@SAPAV1@XZ @ 7 NONAME ; class CRadioSettings * CRadioSettings::NewL(void)
- ?StepSize@CRadioRegion@@QBEKXZ @ 8 NONAME ; unsigned long CRadioRegion::StepSize(void) const
- ?CountryCodes@CRadioRegion@@QAEABV?$RPointerArray@VHBufC16@@@@XZ @ 9 NONAME ; class RPointerArray<class HBufC16> const & CRadioRegion::CountryCodes(void)
- ?MinFrequency@CRadioRegion@@QBEKXZ @ 10 NONAME ; unsigned long CRadioRegion::MinFrequency(void) const
+ ?MinFrequency@CRadioRegion@@QBEKXZ @ 7 NONAME ; unsigned long CRadioRegion::MinFrequency(void) const
+ ?CountryCodes@CRadioRegion@@QAEABV?$RPointerArray@VHBufC16@@@@XZ @ 8 NONAME ; class RPointerArray<class HBufC16> const & CRadioRegion::CountryCodes(void)
Binary file radioengine/settings/cenrep/2002FF52.txt has changed
Binary file radioengine/settings/cenrep/radio.confml has changed
--- a/radioengine/settings/data/fmradioenginesettings.rss Fri Jun 11 13:38:32 2010 +0300
+++ b/radioengine/settings/data/fmradioenginesettings.rss Fri Jun 25 19:09:05 2010 +0300
@@ -21,8 +21,6 @@
// System includes
#include <uikon.rh>
-#include "radiosettings.rh"
-#include "radiopreset.hrh"
#include "radioengine.hrh"
// Resource definitions
@@ -34,33 +32,6 @@
RESOURCE RSS_SIGNATURE { }
-// Non-operator customisable settings
-
-// ---------------------------------------------------------
-// r_qrad_empty_name_preset
-// TBUF16 stores the string name for the empty "Empty"
-// ---------------------------------------------------------
-//
-RESOURCE TBUF256 r_qrad_empty_name_preset
-{
- buf = qtn_radio_ch_empty;
-}
-
-// ---------------------------------------------------------
-// r_qrad_predefined_presets
-// Predefined presets list. No need to include empty presets -- they'll get autogenerated!
-// ---------------------------------------------------------
-//
-// The following array must coexist as the VERY LAST Resource IN THIS FILE, to maintain BC!
-RESOURCE RADIOPRESET r_qrad_empty_presets
-{
- name = "";
- freq_kHz = 0;
- serviceid = "";
- radio_preset_type = ERadioPresetItemEmpty;
- radio_preset_location = "";
-}
-
// ---------------------------------------------------------
//
// ---------------------------------------------------------
@@ -68,13 +39,11 @@
STRUCT RADIO_REGION
{
WORD id;
- WORD stepsize;
+ LONG stepsize;
LONG minfrequency;
LONG maxfrequency;
WORD decimalcount;
LTEXT countrycodes[] = {""};
- LTEXT regionname;
- LTEXT regionsettingname;
}
// ---------------------------------------------------------
@@ -120,8 +89,6 @@
"440",
"441"
};
- regionname = qtn_vr_reg_japan;
- regionsettingname = qtn_vr_set_reg_japan;
}
// ---------------------------------------------------------
@@ -180,8 +147,6 @@
"746", // Suriname
"748" // Uruguay
};
- regionname = qtn_vr_reg_america;
- regionsettingname = qtn_vr_set_reg_america;
}
// ---------------------------------------------------------
@@ -192,21 +157,8 @@
RESOURCE RADIO_REGION r_qrad_region_default
{
id = ERadioRegionDefault;
- stepsize = 50;
+ stepsize = 100;
minfrequency = 87500;
maxfrequency = 108000;
decimalcount = 2;
- regionname = qtn_vr_reg_other;
- regionsettingname = qtn_vr_set_reg_other;
}
-
-// ---------------------------------------------------------
-// r_qtn_qrad_folder_radio_presets
-// TBUF32 stores the string for presets folder name
-// String lenght must be 30 characters
-// ---------------------------------------------------------
-//
-RESOURCE TBUF32 r_qtn_qrad_folder_radio_presets
- {
- buf = qtn_vr_folder_radio_presets;
- }
--- a/radioengine/settings/eabi/fmradioenginesettingsu.def Fri Jun 11 13:38:32 2010 +0300
+++ b/radioengine/settings/eabi/fmradioenginesettingsu.def Fri Jun 25 19:09:05 2010 +0300
@@ -7,8 +7,6 @@
_ZNK12CRadioRegion12DecimalCountEv @ 6 NONAME
_ZNK12CRadioRegion12MaxFrequencyEv @ 7 NONAME
_ZNK12CRadioRegion12MinFrequencyEv @ 8 NONAME
- _ZNK12CRadioRegion15SettingItemNameEv @ 9 NONAME
- _ZNK12CRadioRegion2IdEv @ 10 NONAME
- _ZNK12CRadioRegion4NameEv @ 11 NONAME
- _ZNK12CRadioRegion8StepSizeEv @ 12 NONAME
+ _ZNK12CRadioRegion2IdEv @ 9 NONAME
+ _ZNK12CRadioRegion8StepSizeEv @ 10 NONAME
--- a/radioengine/settings/group/radioenginesettings.mmp Fri Jun 11 13:38:32 2010 +0300
+++ b/radioengine/settings/group/radioenginesettings.mmp Fri Jun 25 19:09:05 2010 +0300
@@ -32,7 +32,7 @@
CAPABILITY CAP_GENERAL_DLL
VENDORID VID_DEFAULT
PAGED
-//LANGUAGE_IDS
+SMPSAFE
LANG SC
SOURCEPATH ../data
--- a/radioengine/settings/inc/radiopreset.hrh Fri Jun 11 13:38:32 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-#ifndef RADIOPRESET_HRH
-#define RADIOPRESET_HRH
-
-#define KVRDefaultPresetFolder 0
-
-/**
- * Preset types.
- */
-enum TRadioPresetType
- {
- ERadioPresetItemEmpty = 0, /**< The preset item is empty, i.e. not initialized yet. */
- ERadioPresetItemRadioContentEnabled = 1, /**< The preset item has radio frequency. */
- ERadioPresetItemVisualRadioContentEnabled = 2 /**< The preset item has visual content enabled. */
- };
-
-#endif // RADIOPRESET_HRH
--- a/radioengine/settings/inc/radiosettings.rh Fri Jun 11 13:38:32 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-#ifndef RADIOSETTINGS_RH
-#define RADIOSETTINGS_RH
-
-// System includes
-#include <uikon.rh>
-
-STRUCT RADIOPRESET
-{
- LTEXT name; // Name of a Radio Station preset
- LONG freq_kHz; // Frequency of the radio, in kHz. 108.0 MHz == 108000 kHz
- LTEXT serviceid; // Visual Radio Service Id for Content server
- BYTE radio_preset_type; // Indicates whether this is a visual radio -enabled preset. 0 indicates false, otherwise true.
- LTEXT radio_preset_location; // Location of the preset
-}
-
-#endif // RADIOSETTINGS_RH
--- a/radioengine/settings/src/cradioenginesettings.cpp Fri Jun 11 13:38:32 2010 +0300
+++ b/radioengine/settings/src/cradioenginesettings.cpp Fri Jun 25 19:09:05 2010 +0300
@@ -607,13 +607,14 @@
GetRepositoryValue( KRadioCRDefaultMinVolumeLevel, temp, temp );
iDefaultMinVolume = temp;
- temp = ERadioRegionNone;
+ temp = ERadioRegionDefault;
GetRepositoryValue( KRadioCRDefaultRegion, temp, temp );
iDefaultRegion = static_cast<TRadioRegion>( temp );
- temp = ERadioRegionNone;
+ temp = iDefaultRegion;
GetRepositoryValue( KRadioCRCurrentRegion, temp, temp );
iRegionId = static_cast<TRadioRegion>( temp );
+ UpdateCurrentRegionIdx( iRegionId );
temp = MinFrequency();
GetRepositoryValue( KRadioCRTunedFrequency, temp, temp );
@@ -755,11 +756,11 @@
if ( ERadioRegionJapan == aRegionId )
{
TInt err = iRepository->Get( KRadioCRRegionAllowedJapan, regionAllowed );
- if ( KErrNone != err )
+ if ( err != KErrNone )
{
// In case the key is not found or otherwise unsuccessfully read,
- // Japan region is not allowed by default.
- regionAllowed = EFalse;
+ // Japan region is allowed by default.
+ regionAllowed = ETrue;
}
}
--- a/radioengine/settings/src/cradioregion.cpp Fri Jun 11 13:38:32 2010 +0300
+++ b/radioengine/settings/src/cradioregion.cpp Fri Jun 25 19:09:05 2010 +0300
@@ -44,7 +44,7 @@
{
LEVEL3( LOG_METHOD_AUTO );
iId = static_cast<TRadioRegion>( aRr.ReadUint16());
- iStepSize = static_cast<TUint16>( aRr.ReadUint16() ) * KRadioThousand;
+ iStepSize = aRr.ReadUint32() * KRadioThousand;
iMinFreq = aRr.ReadUint32() * KRadioThousand;
iMaxFreq = aRr.ReadUint32() * KRadioThousand;
iDecimalCount = aRr.ReadInt16();
@@ -56,9 +56,6 @@
code.Set( aRr.ReadTPtrC());
User::LeaveIfError( iCountryCodes.Append( code.AllocL()));
}
-
- iName = aRr.ReadHBufC16L();
- iSettingName = aRr.ReadHBufC16L();
}
// ---------------------------------------------------------------------------
@@ -87,8 +84,6 @@
LEVEL3( LOG_METHOD_AUTO );
iCountryCodes.ResetAndDestroy();
iCountryCodes.Close();
- delete iName;
- delete iSettingName;
}
// ---------------------------------------------------------
@@ -150,23 +145,3 @@
LEVEL3( LOG_METHOD_AUTO );
return iCountryCodes;
}
-
-// ---------------------------------------------------------
-// Get the name of region
-// ---------------------------------------------------------
-//
-EXPORT_C const TDesC16& CRadioRegion::Name() const
- {
- LEVEL3( LOG_METHOD_AUTO );
- return *iName;
- }
-
-// ---------------------------------------------------------
-// Get the name of region
-// ---------------------------------------------------------
-//
-EXPORT_C const TDesC16& CRadioRegion::SettingItemName() const
- {
- LEVEL3( LOG_METHOD_AUTO );
- return *iSettingName;
- }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioengine/settings/stub/bwins/fmradioenginesettings_stubu.def Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,10 @@
+EXPORTS
+ ?Id@CRadioRegion@@QBE?AW4TRadioRegion@@XZ @ 1 NONAME ; enum TRadioRegion CRadioRegion::Id(void) const
+ ?NewL@CRadioSettings@@SAPAV1@XZ @ 2 NONAME ; class CRadioSettings * CRadioSettings::NewL(void)
+ ?StepSize@CRadioRegion@@QBEKXZ @ 3 NONAME ; unsigned long CRadioRegion::StepSize(void) const
+ ?MaxFrequency@CRadioRegion@@QBEKXZ @ 4 NONAME ; unsigned long CRadioRegion::MaxFrequency(void) const
+ ?DecimalCount@CRadioRegion@@QBEHXZ @ 5 NONAME ; int CRadioRegion::DecimalCount(void) const
+ ??1CRadioSettings@@UAE@XZ @ 6 NONAME ; CRadioSettings::~CRadioSettings(void)
+ ?MinFrequency@CRadioRegion@@QBEKXZ @ 7 NONAME ; unsigned long CRadioRegion::MinFrequency(void) const
+ ?CountryCodes@CRadioRegion@@QAEABV?$RPointerArray@VHBufC16@@@@XZ @ 8 NONAME ; class RPointerArray<class HBufC16> const & CRadioRegion::CountryCodes(void)
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioengine/settings/stub/eabi/fmradioenginesettings_stubu.def Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,12 @@
+EXPORTS
+ _ZN12CRadioRegion12CountryCodesEv @ 1 NONAME
+ _ZN14CRadioSettings4NewLEv @ 2 NONAME
+ _ZN14CRadioSettingsD0Ev @ 3 NONAME
+ _ZN14CRadioSettingsD1Ev @ 4 NONAME
+ _ZN14CRadioSettingsD2Ev @ 5 NONAME
+ _ZNK12CRadioRegion12DecimalCountEv @ 6 NONAME
+ _ZNK12CRadioRegion12MaxFrequencyEv @ 7 NONAME
+ _ZNK12CRadioRegion12MinFrequencyEv @ 8 NONAME
+ _ZNK12CRadioRegion2IdEv @ 9 NONAME
+ _ZNK12CRadioRegion8StepSizeEv @ 10 NONAME
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioengine/settings/stub/group/bld.inf Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,41 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+#include "../../../group/buildflags.hrh"
+
+#ifdef COMPILE_IN_WK48_ENV
+# include <domain/osextensions/platform_paths.hrh>
+#else
+# include <platform_paths.hrh>
+#endif // COMPILE_IN_WK48_ENV
+
+PRJ_PLATFORMS
+WINSCW ARMV5
+
+PRJ_EXPORTS
+//../../include/vrinternalpskeys.h internal/vrinternalpskeys.h
+//../../include/vrinternalcrkeys.h internal/vrinternalcrkeys.h
+
+//../../sis/visualradiostub.sis /epoc32/data/z/system/install/visualradio.sis
+../../group/backup_registration.xml /epoc32/data/z/private/101ff976/backup_registration.xml
+
+../../cenrep/2002FF52.txt /epoc32/data/z/private/10202be9/2002FF52.txt
+../../cenrep/2002FF52.txt /epoc32/RELEASE/winscw/UDEB/Z/private/10202be9/2002FF52.txt
+../../cenrep/2002FF52.txt /epoc32/RELEASE/winscw/UREL/Z/private/10202be9/2002FF52.txt
+
+PRJ_MMPFILES
+radioenginesettings_stub.mmp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioengine/settings/stub/group/radioenginesettings_stub.mmp Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,78 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+#include "../../../group/buildflags.hrh"
+
+#ifdef COMPILE_IN_WK48_ENV
+# include <domain/osextensions/platform_paths.hrh>
+#else
+# include <platform_paths.hrh>
+#endif // COMPILE_IN_WK48_ENV
+
+#include <data_caging_paths.hrh>
+
+#include <data_caging_paths.hrh>
+
+TARGET fmradioenginesettings_stub.dll
+TARGETTYPE DLL
+UID 0x1000008D 0x01000012
+VERSION 10.0
+
+CAPABILITY CAP_GENERAL_DLL
+VENDORID VID_DEFAULT
+PAGED
+SMPSAFE
+LANG SC
+
+SOURCEPATH ../../data
+START RESOURCE fmradioenginesettings.rss
+HEADER
+TARGETPATH RESOURCE_FILES_DIR
+END // RESOURCE
+
+USERINCLUDE ../../api
+USERINCLUDE ../../inc
+USERINCLUDE ../../../utils/api
+USERINCLUDE ../../../utils/inc
+USERINCLUDE /sf/mw/mmmw/mmserv/radioutility/radio_utility/stub/src
+USERINCLUDE /sf/mw/mmmw/mmserv/radioutility/radio_utility/src
+USERINCLUDE /sf/mw/mmmw/mmserv/radioutility/inc
+USERINCLUDE /sf/mw/mmmw/mmserv/inc
+USERINCLUDE /sf/mw/mmmw/inc
+
+APP_LAYER_SYSTEMINCLUDE
+SYSTEMINCLUDE /epoc32/include/internal
+
+SOURCEPATH ../../src
+SOURCE cradioregion.cpp
+SOURCE cradiosettings.cpp
+SOURCE cradiosettingsimp.cpp
+SOURCE cradioenginesettings.cpp
+SOURCE cradioapplicationsettings.cpp
+
+LIBRARY fmradioengineutils_stub.lib
+LIBRARY bafl.lib
+LIBRARY commonengine.lib
+LIBRARY cone.lib
+LIBRARY efsrv.lib
+LIBRARY estor.lib
+LIBRARY euser.lib
+LIBRARY flogger.lib
+LIBRARY RadioSession_Stub.lib // SRadioStubManager functions
+LIBRARY centralrepository.lib
+MACRO STUB_CONSTELLATION
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioengine/settings/tsrc/bwins/SettingsTestModuleu.def Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,3 @@
+EXPORTS
+ ?LibEntryL@@YAPAVCScriptBase@@AAVCTestModuleIf@@@Z @ 1 NONAME ; class CScriptBase * LibEntryL(class CTestModuleIf &)
+
Binary file radioengine/settings/tsrc/cenrep/2002FF52.txt has changed
Binary file radioengine/settings/tsrc/cenrep/2002FF52_orig.txt has changed
Binary file radioengine/settings/tsrc/cenrep/radio.confml has changed
Binary file radioengine/settings/tsrc/cenrep/radio_2002FF52.crml has changed
Binary file radioengine/settings/tsrc/conf/2002FF52.txt has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioengine/settings/tsrc/conf/SettingsTestModule.cfg Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,340 @@
+[Define]
+ChannelFrequencyNull 0
+ChannelFrequency0 104000000
+ChannelFrequency1 97500000
+ChannelFrequency2 91300000
+ChannelFrequency3 11300000
+CBelowMinimumFrequency 34500000
+AboveMaximumFrequency 23400000
+
+Operator_A_MusicStoreName "Operator_A_MusicStore"
+Operator_A_MusicStoreUrl "Operator.A.MusicStore.fi"
+NetworkId_0 "Network_Id_1"
+CountryCode_0 "12345"
+
+ERadioHeadset 0
+ERadioSpeaker 1
+ERadioStereo 0
+ERadioMono 1
+
+KErrNotFound -1
+KErrGeneral -2
+KErrArgument -6
+KErrDiskFull -26
+KErrBadTestParameter -1000
+KErrEventPending -2000
+KErrCallbackErrorCode -2001
+KErrUnexpectedValue -2002
+KExpectedFrequencyChange -2003
+KErrTimeoutController -2007
+[Enddefine]
+
+[Test]
+title Example
+create SettingsTestModule Settings
+Settings Example pa ra me ters
+delete Settings
+[Endtest]
+
+// Settings API functions' tests
+
+[Test]
+title 1.1 Create Settings
+create SettingsTestModule Settings
+Settings CreateSettingsL Preset
+Settings DestroySettingsL
+delete Settings
+[Endtest]
+
+[Test]
+title 1.2 OOM for creation of Settings
+create SettingsTestModule Settings
+oomignorefailure ON
+loop 106
+oomheapfailnext LOOP_COUNTER
+Settings CreateSettingsL Preset
+print LOOP_COUNTER
+endloop
+oomignorefailure OFF
+oomheaptonormal
+Settings DestroySettingsL
+delete Settings
+[Endtest]
+
+[Test]
+title 1.2a Read configurable keys
+create SettingsTestModule Settings
+Settings CreateSettingsL Preset
+Settings ReadConfigurableKeysL
+Settings DestroySettingsL
+delete Settings
+[Endtest]
+
+[Test]
+title 1.3 First time Start performed or not
+create SettingsTestModule Settings
+Settings CreateSettingsL Preset
+Settings tstResetStartCount
+Settings IsFirstTimeStart 1
+Settings SetFirstTimeStartPerformed 1
+Settings IsFirstTimeStart 0
+Settings DestroySettingsL
+delete Settings
+[Endtest]
+
+[Test]
+title 1.4 Set UI Flags
+create SettingsTestModule Settings
+Settings CreateSettingsL Preset
+Settings SetUiFlags 123456789
+Settings UiFlags 123456789
+Settings DestroySettingsL
+delete Settings
+[Endtest]
+
+[Test]
+title 1.5 Set Headset Volume
+create SettingsTestModule Settings
+Settings CreateSettingsL Preset
+Settings SetHeadsetVolume 5
+Settings HeadsetVolume 5
+Settings DestroySettingsL
+delete Settings
+[Endtest]
+
+[Test]
+title 1.6 Set Speaker Volume
+create SettingsTestModule Settings
+Settings CreateSettingsL Preset
+Settings SetSpeakerVolume 6
+Settings SpeakerVolume 6
+Settings DestroySettingsL
+delete Settings
+[Endtest]
+
+[Test]
+title 1.7 Set Volume
+create SettingsTestModule Settings
+Settings CreateSettingsL Preset
+Settings SetVolume 7
+Settings Volume 7
+Settings DestroySettingsL
+delete Settings
+[Endtest]
+
+[Test]
+title 1.8 Output Mode
+create SettingsTestModule Settings
+Settings CreateSettingsL Preset
+Settings SetOutputMode ERadioStereo
+Settings OutputMode ERadioStereo
+Settings SetOutputMode ERadioMono
+Settings OutputMode ERadioMono
+Settings DestroySettingsL
+delete Settings
+[Endtest]
+
+[Test]
+title 1.9 Audio Route
+create SettingsTestModule Settings
+Settings CreateSettingsL Preset
+Settings SetAudioRoute ERadioHeadset
+Settings AudioRoute ERadioHeadset
+Settings SetAudioRoute ERadioHeadset
+Settings AudioRoute ERadioHeadset
+Settings DestroySettingsL
+delete Settings
+[Endtest]
+
+[Test]
+title 1.10 Headset Mute Status
+create SettingsTestModule Settings
+Settings CreateSettingsL Preset
+Settings SetHeadsetVolMuted 0
+Settings IsHeadsetVolMuted 0
+Settings SetHeadsetVolMuted 1
+Settings IsHeadsetVolMuted 1
+Settings DestroySettingsL
+delete Settings
+[Endtest]
+
+[Test]
+title 1.11 Speaker Mute Status
+create SettingsTestModule Settings
+Settings CreateSettingsL Preset
+Settings SetSpeakerVolMuted 0
+Settings IsSpeakerVolMuted 0
+Settings SetSpeakerVolMuted 1
+Settings IsSpeakerVolMuted 1
+Settings DestroySettingsL
+delete Settings
+[Endtest]
+
+[Test]
+title 1.12 Mute Status
+create SettingsTestModule Settings
+Settings CreateSettingsL Preset
+Settings SetVolMuted 0
+Settings IsVolMuted 0
+Settings SetVolMuted 1
+Settings IsVolMuted 1
+Settings DestroySettingsL
+delete Settings
+[Endtest]
+
+[Test]
+title 1.13 Power On Status
+create SettingsTestModule Settings
+Settings CreateSettingsL Preset
+Settings SetPowerOn 0
+Settings IsPowerOn 0
+Settings SetPowerOn 1
+Settings IsPowerOn 1
+Settings DestroySettingsL
+delete Settings
+[Endtest]
+
+[Test]
+title 1.14 Tuned Frequency
+create SettingsTestModule Settings
+Settings CreateSettingsL Preset
+Settings SetTunedFrequency ChannelFrequency1
+Settings TunedFrequency ChannelFrequency1
+Settings SetTunedFrequency ChannelFrequency3
+Settings TunedFrequency ChannelFrequency3
+Settings SetTunedFrequency BelowMinimumFrequency
+Settings SetTunedFrequency AboveMaximumFrequency
+Settings DestroySettingsL
+delete Settings
+[Endtest]
+
+[Test]
+title 1.15 Default Minimum Volume Level
+create SettingsTestModule Settings
+Settings CreateSettingsL Preset
+Settings DefaultMinVolumeLevel
+Settings DestroySettingsL
+delete Settings
+[Endtest]
+
+[Test]
+title 1.16 Regions' Count
+create SettingsTestModule Settings
+Settings CreateSettingsL Preset
+Settings CountRegions
+Settings DestroySettingsL
+delete Settings
+[Endtest]
+
+[Test]
+title 1.17 Region
+create SettingsTestModule Settings
+Settings CreateSettingsL Preset
+Settings Region
+Settings DestroySettingsL
+delete Settings
+[Endtest]
+
+[Test]
+title 1.18 Region's Identification
+create SettingsTestModule Settings
+Settings CreateSettingsL Preset
+Settings SetRegionId 2
+Settings RegionId 2
+Settings DestroySettingsL
+delete Settings
+[Endtest]
+
+[Test]
+title 1.19 Frequency Step Size
+create SettingsTestModule Settings
+Settings CreateSettingsL Preset
+Settings FrequencyStepSize
+Settings DestroySettingsL
+delete Settings
+[Endtest]
+
+[Test]
+title 1.20 Minimum Frequency
+create SettingsTestModule Settings
+Settings CreateSettingsL Preset
+Settings MinFrequency
+Settings DestroySettingsL
+delete Settings
+[Endtest]
+
+[Test]
+title 1.21 Maximum Frequency
+create SettingsTestModule Settings
+Settings CreateSettingsL Preset
+Settings MaxFrequency
+Settings DestroySettingsL
+delete Settings
+[Endtest]
+
+[Test]
+title 1.22 Decimal Count
+create SettingsTestModule Settings
+Settings CreateSettingsL Preset
+Settings DecimalCount
+Settings DestroySettingsL
+delete Settings
+[Endtest]
+
+[Test]
+title 1.23 Default Region
+create SettingsTestModule Settings
+Settings CreateSettingsL Preset
+Settings DefaultRegion
+Settings DestroySettingsL
+delete Settings
+[Endtest]
+
+[Test]
+title 1.24 Network Id
+create SettingsTestModule Settings
+Settings CreateSettingsL Preset
+Settings SetNetworkId NetworkId_0
+Settings NetworkId NetworkId_0
+Settings DestroySettingsL
+delete Settings
+[Endtest]
+
+[Test]
+title 1.25 Country Code
+create SettingsTestModule Settings
+Settings CreateSettingsL Preset
+Settings SetCountryCode CountryCode_0
+Settings CountryCode CountryCode_0
+Settings DestroySettingsL
+delete Settings
+[Endtest]
+
+[Test]
+title 1.26 Is Region Allowed
+create SettingsTestModule Settings
+Settings CreateSettingsL Preset
+Settings IsRegionAllowed
+Settings DestroySettingsL
+delete Settings
+[Endtest]
+
+[Test]
+title 1.27 Resolve Drive
+create SettingsTestModule Settings
+Settings CreateSettingsL Preset
+Settings ResolveDriveL
+Settings DestroySettingsL
+delete Settings
+[Endtest]
+
+[Test]
+title 1.28 Change of Region
+create SettingsTestModule Settings
+Settings CreateSettingsL Preset
+Settings SetRegionId 0
+pause 10000
+Settings RegionId 0
+Settings DestroySettingsL
+delete Settings
+[Endtest]
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioengine/settings/tsrc/conf/atsconf.txt Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,34 @@
+;Run \vado\videoplayer\tsrc\testing\tools\genATSdrop.pl from
+;the tsrc folder to create ATS3 drop.
+[DROP]
+NAME Radio - engine - settings
+DEVICE Vasco
+LONGREBOOT
+FLASH W:\output\release_flash_images\vasco\rnd\core\RM-596_2010.22_79.01.2010.22_rnd.core.fpsx
+FLASH W:\output\release_flash_images\vasco\rnd\langpack\langpack_01\RM-596_2010.22_01.01_Euro_1_79.01.2010.22_rnd.rofs2.fpsx
+FLASH W:\output\release_flash_images\vasco\rnd\customer\custvariant_01_tools\RM-596_2010.22_01.01_tools_79.01.2010.22_rnd.rofs3.fpsx
+FLASH W:\output\release_flash_images\vasco\rnd\uda\RM-596_2010.22_79.01.2010.22_rnd.udaerase.fpsx
+PKG group\SettingsTestModule.pkg
+BOOT
+INI init\TestFramework.ini 600
+EMAIL jouni.vallo@nokia.com
+RUN
+[ENDDROP]
+
+;
+; ats3tools synergyyn vai verkkolevylle ja manuaalisesti kopioida sieltä?
+;
+; TODO
+; oikeuksien haku Tampereen ATS3
+; imagen luonti, imaker vasco_ui default
+; Testframework.ini täytyy olla init hakemistossa
+; cenrep täytyy HW:sta, .cre tiedosto ja lisätä custom/prerun_custom.xml tiedostoon
+;
+; STEPIT:
+; säädä conf/atsconf.txt asetukset kohdalleen
+; komentorivillä tsrc hakemistoon ja aja:
+; perl \ats3tools\genATSdrop.pl -f conf\atsconf.txt -u käyttäjä -p salasana
+;
+;
+;
+;
Binary file radioengine/settings/tsrc/conf/radio.confml has changed
Binary file radioengine/settings/tsrc/conf/radio_2002FF52.crml has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioengine/settings/tsrc/custom/postrun_custom.xml Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,32 @@
+<step name="Fetch Test module Report" harness="STIF" enabled="true" passrate="100" significant="false">
+ <command>fetch-log</command>
+ <params>
+ <param type="text"/>
+ <param delete="true"/>
+ <param path="C:\Logs\TestFramework\*"/>
+ </params>
+</step>
+<step name="Fetch TestScripter logs" harness="STIF" enabled="true" passrate="100" significant="false">
+ <command>fetch-log</command>
+ <params>
+ <param type="text"/>
+ <param delete="true"/>
+ <param path="C:\Logs\TestFramework\TestScripter\*"/>
+ </params>
+</step>
+<step name="Fetch Testengine logs" harness="STIF" enabled="true" passrate="100" significant="false">
+ <command>fetch-log</command>
+ <params>
+ <param type="text"/>
+ <param delete="true"/>
+ <param path="C:\Logs\TestFramework\Testengine\*"/>
+ </params>
+</step>
+<step name="Fetch Testserver logs" harness="STIF" enabled="true" passrate="100" significant="false">
+ <command>fetch-log</command>
+ <params>
+ <param type="text"/>
+ <param delete="true"/>
+ <param path="C:\Logs\TestFramework\Testserver\*"/>
+ </params>
+</step>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioengine/settings/tsrc/custom/prerun_custom.xml Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,34 @@
+<step name="Create log directory for testmodule" harness="STIF" enabled="true" passrate="100" significant="false">
+ <command>makedir</command>
+ <params>
+ <param dir="c:\logs\testframework"/>
+ </params>
+</step>
+<step name="Create directory for TestScripter logs" harness="STIF" enabled="true" passrate="100" significant="false">
+ <command>makedir</command>
+ <params>
+ <param dir="c:\logs\testframework\TestScripter"/>
+ </params>
+</step>
+<step name="Create directory for Testengine logs" harness="STIF" enabled="true" passrate="100" significant="false">
+ <command>makedir</command>
+ <params>
+ <param dir="c:\logs\testframework\Testengine"/>
+ </params>
+</step>
+<step name="Create directory for Testserver logs" harness="STIF" enabled="true" passrate="100" significant="false">
+ <command>makedir</command>
+ <params>
+ <param dir="c:\logs\testframework\Testserver"/>
+ </params>
+</step>
+<!---
+<step name="Install IAP file" harness="STIF" enabled="true" passrate="100" significant="false">
+ <command>install</command>
+ <reboot target-alias="*" when="after" />
+ <params>
+ <param src="cccccc00.cre"/>
+ <param dst="c:\private\10202be9\persists\cccccc00.cre"/>
+ </params>
+</step>
+-->
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioengine/settings/tsrc/eabi/SettingsTestModuleu.def Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,3 @@
+EXPORTS
+ _Z9LibEntryLR13CTestModuleIf @ 1 NONAME
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioengine/settings/tsrc/group/Bld.inf Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,63 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+#include <platform_paths.hrh>
+
+
+PRJ_PLATFORMS
+// specify the platforms your component needs to be built for here
+// defaults to WINS MARM so you can ignore this if you just build these
+
+ DEFAULT
+
+PRJ_TESTEXPORTS
+// NOTE: If using ARS requirements all export operations should be done under this.
+// 'abld test export'
+
+PRJ_EXPORTS
+// Specify the source file followed by its destination here
+// copy will be used to copy the source file to its destination
+// If there's no destination then the source file will be copied
+// to the same name in /epoc32/include
+// Example:
+/*
+/agnmodel/inc/AGMCOMON.H
+*/
+../rom/settingstestmodule.iby CORE_APP_LAYER_IBY_EXPORT_PATH(settingstestmodule.iby)
+
+PRJ_TESTMMPFILES
+
+ SettingsTestModule.mmp
+
+PRJ_MMPFILES
+
+ SettingsTestModule_nrm.mmp
+
+// Specify the .mmp files required for building the important component
+// releasables.
+//
+// Specify "tidy" if the component you need to build doesn't need to be
+// released. Specify "ignore" if the MMP file exists but should be
+// ignored.
+// Example:
+/*
+/agnmodel/group/agnmodel.mmp
+#if defined(MARM)
+/agnmodel/group/agsvexe.mmp
+#endif
+*/
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioengine/settings/tsrc/group/RestoreOrigCenrep.cmd Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,9 @@
+@echo Original environment restoration by settingstestmodule...
+del \epoc32\winscw\c\TestFramework\SettingsTestModule.cfg
+del \epoc32\wins\c\TestFramework\TestFramework.ini
+del \epoc32\winscw\c\TestFramework\TestFramework.ini
+copy ..\cenrep\2002FF52.txt \epoc32\data\z\private\10202be9\2002FF52.txt
+copy ..\cenrep\2002FF52.txt \epoc32\RELEASE\winscw\UDEB\Z\private\10202be9\2002FF52.txt
+copy ..\cenrep\2002FF52.txt \epoc32\RELEASE\winscw\UREL\Z\private\10202be9\2002FF52.txt
+del \epoc32\winscw\c\private\10202BE9\persists\2002FF52.cre
+@echo Original environment restoration by settingstestmodule... Finished.
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioengine/settings/tsrc/group/SettingsTestModule.mmp Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,84 @@
+/*TYPE TESTCLASS*/
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: MMP file for STIF Test Framework's TestScripter
+* testclass test module.
+*
+*/
+
+#include <platform_paths.hrh>
+
+TARGET SettingsTestModule.dll
+TARGETTYPE dll
+UID 0x1000008D 0x101FB3E3
+
+CAPABILITY ALL -TCB
+/* Remove comments and replace 0x00000000 with correct vendor id */
+// VENDORID 0x00000000
+/* Remove comments and replace 0x00000000 with correct secure id */
+// SECUREID 0x00000000
+
+//TARGETPATH ?target_path
+DEFFILE SettingsTestModule.def
+
+USERINCLUDE ../inc
+USERINCLUDE ../../inc
+USERINCLUDE ../../api
+USERINCLUDE ../../../utils/api
+USERINCLUDE ../../../utils/inc
+
+APP_LAYER_SYSTEMINCLUDE
+SYSTEMINCLUDE /epoc32/include/internal
+
+SOURCEPATH ../src
+
+SOURCE SettingsTestModule.cpp
+SOURCE SettingsTestModuleBlocks.cpp
+
+//RESOURCE resource_file
+//RESOURCE resource_file2
+
+LIBRARY euser.lib
+LIBRARY stiftestinterface.lib
+LIBRARY stiftestengine.lib
+LIBRARY fmradioenginesettings.lib
+LIBRARY fmradioengineutils.lib
+LIBRARY centralrepository.lib
+
+LANG SC
+SMPSAFE
+
+/*
+START WINS
+?wins_specific_information
+END
+
+START MARM
+?marm_specific_information
+END
+*/
+// Other possible keywords:
+
+// DOCUMENT ?file, that is not compiled, but added to MSVC project workspace (i.e. release notes)
+/*
+START BITMAP ?target
+TARGETPATH ?emulated_path_on_target_machine
+HEADER
+SOURCE ?color_depth ?source_bitmap
+END
+*/
+// DEFFILE ?filename
+// AIF ?filename
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioengine/settings/tsrc/group/SettingsTestModule.pkg Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,62 @@
+;
+; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+; Installation file for STIF
+;
+
+; Languages
+&EN
+
+; Provide value for uid
+#{"STIF"},(0x00000000),1,1,0,TYPE=SA
+
+; Series60 product id for S60 3.0
+[0x101F7961], 0, 0, 0, {"Series60ProductID"}
+
+; Localised Vendor name
+%{"Nokia"}
+
+; Unique Vendor name
+:"Nokia"
+
+; Logo
+; None
+
+; Package signature - Optional
+; None
+
+; Start of Package body
+
+; Condition blocks
+; None
+
+; Options list
+; None
+
+; Install files
+"\epoc32\release\armv5\udeb\SettingsTestModule.dll" - "!:\Sys\Bin\SettingsTestModule.dll"
+"conf\SettingsTestModule.cfg" - "c:\testframework\SettingsTestModule.cfg"
+
+
+; Embedded SIS
+; None
+
+; End of Package body
+
+; PKG dependencies
+; None
+
+; PKG capabilities
+; None
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioengine/settings/tsrc/group/SettingsTestModule_DoxyFile.txt Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,239 @@
+#
+# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description:
+#
+#
+
+# Doxyfile 1.4.1
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+PROJECT_NAME = SettingsTestModule
+PROJECT_NUMBER =
+OUTPUT_DIRECTORY = C:\Symbian\Carbide\workspace\SettingsTestModule\
+CREATE_SUBDIRS = NO
+OUTPUT_LANGUAGE = English
+USE_WINDOWS_ENCODING = YES
+BRIEF_MEMBER_DESC = YES
+REPEAT_BRIEF = YES
+ABBREVIATE_BRIEF =
+ALWAYS_DETAILED_SEC = NO
+INLINE_INHERITED_MEMB = NO
+FULL_PATH_NAMES = NO
+STRIP_FROM_PATH =
+STRIP_FROM_INC_PATH =
+SHORT_NAMES = NO
+JAVADOC_AUTOBRIEF = NO
+MULTILINE_CPP_IS_BRIEF = NO
+DETAILS_AT_TOP = NO
+INHERIT_DOCS = YES
+DISTRIBUTE_GROUP_DOC = NO
+TAB_SIZE = 8
+ALIASES =
+OPTIMIZE_OUTPUT_FOR_C = YES
+OPTIMIZE_OUTPUT_JAVA = NO
+SUBGROUPING = YES
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+EXTRACT_ALL = YES
+EXTRACT_PRIVATE = NO
+EXTRACT_STATIC = NO
+EXTRACT_LOCAL_CLASSES = NO
+EXTRACT_LOCAL_METHODS = NO
+HIDE_UNDOC_MEMBERS = NO
+HIDE_UNDOC_CLASSES = NO
+HIDE_FRIEND_COMPOUNDS = NO
+HIDE_IN_BODY_DOCS = NO
+INTERNAL_DOCS = YES
+CASE_SENSE_NAMES = YES
+HIDE_SCOPE_NAMES = NO
+SHOW_INCLUDE_FILES = YES
+INLINE_INFO = YES
+SORT_MEMBER_DOCS = YES
+SORT_BRIEF_DOCS = NO
+SORT_BY_SCOPE_NAME = NO
+GENERATE_TODOLIST = NO
+GENERATE_TESTLIST = NO
+GENERATE_BUGLIST = NO
+GENERATE_DEPRECATEDLIST= YES
+ENABLED_SECTIONS =
+MAX_INITIALIZER_LINES = 30
+SHOW_USED_FILES = YES
+SHOW_DIRECTORIES = YES
+FILE_VERSION_FILTER =
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+QUIET = NO
+WARNINGS = YES
+WARN_IF_UNDOCUMENTED = YES
+WARN_IF_DOC_ERROR = YES
+WARN_NO_PARAMDOC = NO
+WARN_FORMAT = "$file:$line: $text"
+WARN_LOGFILE =
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+INPUT = C:\Symbian\Carbide\workspace\SettingsTestModule\
+FILE_PATTERNS = *.h \
+ *.rh \
+ *.hrh
+RECURSIVE = YES
+EXCLUDE =
+EXCLUDE_SYMLINKS = NO
+EXCLUDE_PATTERNS =
+EXAMPLE_PATH =
+EXAMPLE_PATTERNS =
+EXAMPLE_RECURSIVE = NO
+IMAGE_PATH =
+INPUT_FILTER =
+FILTER_PATTERNS =
+FILTER_SOURCE_FILES = NO
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+SOURCE_BROWSER = NO
+INLINE_SOURCES = NO
+STRIP_CODE_COMMENTS = YES
+REFERENCED_BY_RELATION = YES
+REFERENCES_RELATION = YES
+VERBATIM_HEADERS = YES
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+ALPHABETICAL_INDEX = NO
+COLS_IN_ALPHA_INDEX = 5
+IGNORE_PREFIX =
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+GENERATE_HTML = NO
+HTML_OUTPUT = html
+HTML_FILE_EXTENSION = .html
+HTML_HEADER =
+HTML_FOOTER =
+HTML_STYLESHEET =
+HTML_ALIGN_MEMBERS = YES
+GENERATE_HTMLHELP = YES
+CHM_FILE =
+HHC_LOCATION =
+GENERATE_CHI = NO
+BINARY_TOC = YES
+TOC_EXPAND = YES
+DISABLE_INDEX = YES
+ENUM_VALUES_PER_LINE = 4
+GENERATE_TREEVIEW = YES
+TREEVIEW_WIDTH = 250
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+GENERATE_LATEX = NO
+LATEX_OUTPUT = latex
+LATEX_CMD_NAME = latex
+MAKEINDEX_CMD_NAME = makeindex
+COMPACT_LATEX = NO
+PAPER_TYPE = a4wide
+EXTRA_PACKAGES =
+LATEX_HEADER =
+PDF_HYPERLINKS = NO
+USE_PDFLATEX = NO
+LATEX_BATCHMODE = NO
+LATEX_HIDE_INDICES = NO
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+GENERATE_RTF = YES
+RTF_OUTPUT = Doc
+COMPACT_RTF = YES
+RTF_HYPERLINKS = YES
+RTF_STYLESHEET_FILE =
+RTF_EXTENSIONS_FILE =
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+GENERATE_MAN = NO
+MAN_OUTPUT = man
+MAN_EXTENSION = .3
+MAN_LINKS = NO
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+GENERATE_XML = NO
+XML_OUTPUT = xml
+XML_SCHEMA =
+XML_DTD =
+XML_PROGRAMLISTING = YES
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+GENERATE_AUTOGEN_DEF = NO
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+GENERATE_PERLMOD = NO
+PERLMOD_LATEX = NO
+PERLMOD_PRETTY = YES
+PERLMOD_MAKEVAR_PREFIX =
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+ENABLE_PREPROCESSING = YES
+MACRO_EXPANSION = YES
+EXPAND_ONLY_PREDEF = NO
+SEARCH_INCLUDES = YES
+INCLUDE_PATH =
+INCLUDE_FILE_PATTERNS =
+PREDEFINED = NONSHARABLE_CLASS
+EXPAND_AS_DEFINED =
+SKIP_FUNCTION_MACROS = YES
+#---------------------------------------------------------------------------
+# Configuration::additions related to external references
+#---------------------------------------------------------------------------
+TAGFILES =
+GENERATE_TAGFILE =
+ALLEXTERNALS = NO
+EXTERNAL_GROUPS = YES
+PERL_PATH = /usr/bin/perl
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+CLASS_DIAGRAMS = YES
+HIDE_UNDOC_RELATIONS = YES
+HAVE_DOT = NO
+CLASS_GRAPH = YES
+COLLABORATION_GRAPH = YES
+GROUP_GRAPHS = YES
+UML_LOOK = NO
+TEMPLATE_RELATIONS = YES
+INCLUDE_GRAPH = YES
+INCLUDED_BY_GRAPH = YES
+CALL_GRAPH = NO
+GRAPHICAL_HIERARCHY = YES
+DIRECTORY_GRAPH = YES
+DOT_IMAGE_FORMAT = png
+DOT_PATH =
+DOTFILE_DIRS =
+MAX_DOT_GRAPH_WIDTH = 1024
+MAX_DOT_GRAPH_HEIGHT = 1024
+MAX_DOT_GRAPH_DEPTH = 0
+DOT_TRANSPARENT = NO
+DOT_MULTI_TARGETS = NO
+GENERATE_LEGEND = YES
+DOT_CLEANUP = YES
+#---------------------------------------------------------------------------
+# Configuration::additions related to the search engine
+#---------------------------------------------------------------------------
+SEARCHENGINE = NO
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioengine/settings/tsrc/group/SettingsTestModule_nrm.mmp Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,84 @@
+/*TYPE TESTCLASS*/
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: MMP file for STIF Test Framework's TestScripter
+* testclass test module.
+*
+*/
+
+#include <platform_paths.hrh>
+
+TARGET SettingsTestModule.dll
+TARGETTYPE dll
+UID 0x1000008D 0x101FB3E3
+
+CAPABILITY ALL -TCB
+/* Remove comments and replace 0x00000000 with correct vendor id */
+// VENDORID 0x00000000
+/* Remove comments and replace 0x00000000 with correct secure id */
+// SECUREID 0x00000000
+
+//TARGETPATH ?target_path
+DEFFILE SettingsTestModule.def
+
+USERINCLUDE ../inc
+USERINCLUDE ../../inc
+USERINCLUDE ../../api
+USERINCLUDE ../../../utils/api
+USERINCLUDE ../../../utils/inc
+
+APP_LAYER_SYSTEMINCLUDE
+SYSTEMINCLUDE /epoc32/include/internal
+
+SOURCEPATH ../src
+
+SOURCE SettingsTestModule.cpp
+SOURCE SettingsTestModuleBlocks.cpp
+
+//RESOURCE resource_file
+//RESOURCE resource_file2
+
+LIBRARY euser.lib
+LIBRARY stiftestinterface.lib
+LIBRARY stiftestengine.lib
+LIBRARY fmradioenginesettings.lib
+LIBRARY fmradioengineutils.lib
+LIBRARY centralrepository.lib
+
+LANG SC
+SMPSAFE
+
+/*
+START WINS
+?wins_specific_information
+END
+
+START MARM
+?marm_specific_information
+END
+*/
+// Other possible keywords:
+
+// DOCUMENT ?file, that is not compiled, but added to MSVC project workspace (i.e. release notes)
+/*
+START BITMAP ?target
+TARGETPATH ?emulated_path_on_target_machine
+HEADER
+SOURCE ?color_depth ?source_bitmap
+END
+*/
+// DEFFILE ?filename
+// AIF ?filename
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioengine/settings/tsrc/group/TestEnvInit.cmd Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,12 @@
+@echo Initializing test environment for settingstestmodule...
+copy ..\conf\SettingsTestModule.cfg \epoc32\wins\c\TestFramework\SettingsTestModule.cfg
+copy ..\conf\SettingsTestModule.cfg \epoc32\winscw\c\TestFramework\SettingsTestModule.cfg
+copy ..\conf\SettingsTestModule.cfg \epoc32\data\z\system\data\SettingsTestModule.cfg
+copy ..\init\TestFramework.ini \epoc32\wins\c\TestFramework\TestFramework.ini
+copy ..\init\TestFramework.ini \epoc32\winscw\c\TestFramework\TestFramework.ini
+copy ..\init\TestFramework.ini \epoc32\data\z\system\data\TestFramework.ini
+copy ..\conf\2002FF52.txt \epoc32\data\z\private\10202be9\2002FF52.txt
+copy ..\conf\2002FF52.txt \epoc32\release\winscw\udeb\z\private\10202be9\2002FF52.txt
+copy ..\conf\2002FF52.txt \epoc32\release\winscw\urel\z\private\10202be9\2002FF52.txt
+del \epoc32\winscw\c\private\10202be9\persists\2002FF52.cre
+@echo Test environment initialization for settingstestmodule... Finished.
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioengine/settings/tsrc/inc/SettingsTestModule.h Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,286 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: STIF testclass declaration
+*
+*/
+
+#ifndef SettingsTestMODULE_H
+#define SettingsTestMODULE_H
+
+// INCLUDES
+#include <StifLogger.h>
+#include <TestScripterInternal.h>
+#include <StifTestModule.h>
+#include <TestclassAssert.h>
+//INTERNAL INCLUDES
+#include "cradiosettings.h"
+#include "mradiosettingsobserver.h"
+#include "trace.h"
+
+
+// CONSTANTS
+const TInt KErrBadTestParameter= -1000; // Error on configuration file
+
+const TInt KErrEventPending =-2000; // Timeout and not callback
+const TInt KErrCallbackErrorCode = -2001; // Callback return error code
+const TInt KErrUnexpectedValue =-2002; // Unexpected value at setting
+const TInt KExpectedFrequencyChange = -2003; // Is not finding more than one station
+const TInt KErrTimeoutController = -2007; // Unexpected notification
+
+// MACROS
+//#define ?macro ?macro_def
+#define TEST_CLASS_VERSION_MAJOR 1
+#define TEST_CLASS_VERSION_MINOR 1
+#define TEST_CLASS_VERSION_BUILD 1
+
+// Logging path
+_LIT( KSettingsTestModuleLogPath, "\\logs\\testframework\\SettingsTestModule\\" );
+// Log file
+_LIT( KSettingsTestModuleLogFile, "SettingsTestModule.txt" );
+_LIT( KSettingsTestModuleLogFileWithTitle, "SettingsTestModule_[%S].txt" );
+
+// FUNCTION PROTOTYPES
+//?type ?function_name(?arg_list);
+
+// FORWARD DECLARATIONS
+//class ?FORWARD_CLASSNAME;
+//class CSettingsTestModule;
+
+// DATA TYPES
+//enum ?declaration
+//typedef ?declaration
+//extern ?data_type;
+
+// CLASS DECLARATION
+
+/**
+* CSettingsTestModule test class for STIF Test Framework TestScripter.
+* ?other_description_lines
+*
+* @lib ?library
+* @since ?Series60_version
+*/
+NONSHARABLE_CLASS(CSettingsTestModule) : public CScriptBase, public MRadioSettingsObserver
+ {
+ public: // Constructors and destructor
+
+ /**
+ * Two-phased constructor.
+ */
+ static CSettingsTestModule* NewL( CTestModuleIf& aTestModuleIf );
+
+ /**
+ * Destructor.
+ */
+ virtual ~CSettingsTestModule();
+
+ public: // New functions
+
+ /**
+ * ?member_description.
+ * @since ?Series60_version
+ * @param ?arg1 ?description
+ * @return ?description
+ */
+ //?type ?member_function( ?type ?arg1 );
+
+ public: // Functions from base classes
+
+ /**
+ * From CScriptBase Runs a script line.
+ * @since ?Series60_version
+ * @param aItem Script line containing method name and parameters
+ * @return Symbian OS error code
+ */
+ virtual TInt RunMethodL( CStifItemParser& aItem );
+
+ // MRadioSettingsObserver
+
+ /**
+ * From MRadioSettingsObserver.
+ * Notifies of the change in RDS alternate frequency setting
+ *
+ * @param aEnabled ETrue if AF search is enabled, otherwise EFalse
+ */
+ virtual void RdsAfSearchSettingChangedL( TBool aEnabled );
+
+ /**
+ * From MRadioSettingsObserver.
+ * Notifies of the change in region setting when it is changed
+ * outside of the particular radio settings instance
+ *
+ * @param aRegion The new region ID
+ */
+ virtual void RegionSettingChangedL( TInt aRegion );
+
+ protected: // New functions
+
+ /**
+ * ?member_description.
+ * @since ?Series60_version
+ * @param ?arg1 ?description
+ * @return ?description
+ */
+ //?type ?member_function( ?type ?arg1 );
+ // Test case functions
+ TInt CreateSettingsL( CStifItemParser& aItem );
+ TInt DestroySettingsL( CStifItemParser& aItem );
+
+ TInt IsRegionAllowed( CStifItemParser& aItem );
+
+ TInt ResolveDriveL( CStifItemParser& aItem );
+
+ // Application Settings functions
+
+ TInt SetFirstTimeStartPerformed( CStifItemParser& aItem );
+ TInt IsFirstTimeStart( CStifItemParser& aItem );
+
+ TInt SetUiFlags( CStifItemParser& aItem );
+
+ TInt UiFlags( CStifItemParser& aItem );
+
+ // Settings functions
+
+ TInt HeadsetVolume ( CStifItemParser& aItem );
+ TInt SpeakerVolume ( CStifItemParser& aItem );
+ TInt Volume ( CStifItemParser& aItem );
+ TInt OutputMode ( CStifItemParser& aItem );
+ TInt AudioRoute ( CStifItemParser& aItem );
+ TInt IsHeadsetVolMuted ( CStifItemParser& aItem );
+ TInt IsSpeakerVolMuted ( CStifItemParser& aItem );
+ TInt IsVolMuted ( CStifItemParser& aItem );
+ TInt IsPowerOn ( CStifItemParser& aItem );
+ TInt TunedFrequency ( CStifItemParser& aItem );
+ TInt DefaultMinVolumeLevel ( CStifItemParser& aItem );
+ TInt CountRegions ( CStifItemParser& aItem );
+ TInt Region ( CStifItemParser& aItem );
+ TInt RegionId ( CStifItemParser& aItem );
+ TInt FrequencyStepSize ( CStifItemParser& aItem );
+ TInt MaxFrequency ( CStifItemParser& aItem );
+ TInt MinFrequency ( CStifItemParser& aItem );
+ TInt DecimalCount ( CStifItemParser& aItem );
+ TInt DefaultRegion ( CStifItemParser& aItem );
+ TInt NetworkId ( CStifItemParser& aItem );
+ TInt CountryCode ( CStifItemParser& aItem );
+ TInt OperatorMusicStoreURL ( CStifItemParser& aItem );
+ TInt OperatorMusicStoreName ( CStifItemParser& aItem );
+
+ // Setter functions
+
+ TInt SetHeadsetVolume ( CStifItemParser& aItem );
+ TInt SetSpeakerVolume ( CStifItemParser& aItem );
+ TInt SetVolume ( CStifItemParser& aItem );
+ TInt SetOutputMode ( CStifItemParser& aItem );
+ TInt SetAudioRoute ( CStifItemParser& aItem );
+ TInt SetHeadsetVolMuted ( CStifItemParser& aItem );
+ TInt SetSpeakerVolMuted ( CStifItemParser& aItem );
+ TInt SetVolMuted ( CStifItemParser& aItem );
+ TInt SetPowerOn ( CStifItemParser& aItem );
+ TInt SetTunedFrequency ( CStifItemParser& aItem );
+ TInt SetRegionId ( CStifItemParser& aItem );
+ TInt SetNetworkId ( CStifItemParser& aItem );
+ TInt SetCountryCode ( CStifItemParser& aItem );
+ TInt SetOperatorMusicStoreURL ( CStifItemParser& aItem );
+ TInt SetOperatorMusicStoreName ( CStifItemParser& aItem );
+
+ // Tst functions
+ TInt ReadConfigurableKeysL ( CStifItemParser& aItem );
+ TInt tstSetRegionIdL ( CStifItemParser& aItem );
+ TInt tstIsRegionSettingChangeNotified ( CStifItemParser& aItem );
+ TInt tstResetStartCount ( CStifItemParser& aItem );
+
+ protected: // Functions from base classes
+
+ /**
+ * From ?base_class ?member_description
+ */
+ //?type ?member_function();
+
+ private:
+
+ /**
+ * C++ default constructor.
+ */
+ CSettingsTestModule( CTestModuleIf& aTestModuleIf );
+
+ /**
+ * By default Symbian 2nd phase constructor is private.
+ */
+ void ConstructL();
+
+ // Prohibit copy constructor if not deriving from CBase.
+ // ?classname( const ?classname& );
+ // Prohibit assigment operator if not deriving from CBase.
+ // ?classname& operator=( const ?classname& );
+
+ /**
+ * Frees all resources allocated from test methods.
+ * @since ?Series60_version
+ */
+ void Delete();
+
+ /**
+ * Test methods are listed below.
+ */
+
+ /**
+ * Example test method.
+ * @since ?Series60_version
+ * @param aItem Script line containing parameters.
+ * @return Symbian OS error code.
+ */
+ virtual TInt ExampleL( CStifItemParser& aItem );
+
+ /**
+ * Method used to log version of test class
+ */
+ void SendTestClassVersion();
+
+ //ADD NEW METHOD DEC HERE
+ //[TestMethods] - Do not remove
+
+ public: // Data
+ // ?one_line_short_description_of_data
+ //?data_declaration;
+
+ protected: // Data
+ // ?one_line_short_description_of_data
+ //?data_declaration;
+
+ private: // Data
+
+ // ?one_line_short_description_of_data
+ //?data_declaration;
+
+ // Reserved pointer for future extension
+ //TAny* iReserved;
+
+ /** Radio Settings */
+ CRadioSettings* iSettings;
+
+ TBool iRegionSettingChangeNotified;
+
+
+ public: // Friend classes
+ //?friend_class_declaration;
+ protected: // Friend classes
+ //?friend_class_declaration;
+ private: // Friend classes
+ //?friend_class_declaration;
+
+ };
+
+#endif // SettingsTestMODULE_H
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioengine/settings/tsrc/inc/trace.h Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,596 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Symbian Foundation License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+* Trace macro definitions.
+*
+*/
+
+#ifndef TRACE_H
+#define TRACE_H
+
+#include <e32base.h> // TCleanupItem
+#include "traceconfiguration.hrh"
+
+#ifdef TRACE_INTO_FILE
+#include <flogger.h> // RFileLogger
+#else
+#include <e32debug.h> // RDebug
+#endif
+
+//-----------------------------------------------------------------------------
+// Constants
+//-----------------------------------------------------------------------------
+//
+
+// NOTE!
+// Replace all COMPONENT_NAME occurnaces with your own component / module name.
+
+/**
+* Prefix trace macro to complete tracing with component name.
+* Returns TDesC which can be used directly with RDebug or RFileLogger.
+*/
+#define _PREFIX_TRACE( aMsg ) TPtrC( (const TText*)L"[Settings]: " L##aMsg )
+
+/**
+* Prefix error trace
+*/
+#define _PREFIX_ERROR( aMsg ) _PREFIX_TRACE( "[ERROR: %d]: " L##aMsg )
+
+/**
+* Prefix info trace.
+*/
+#define _PREFIX_INFO( aMsg ) _PREFIX_TRACE( "[INFO]: " L##aMsg )
+
+/**
+* Prefix macro for strings
+*/
+#define _PREFIX_CHAR( aMsg ) (const char*)"[Settings]: " ##aMsg
+
+/**
+* Define needed directories if TRACE_INTO_FILE macro in use
+*/
+#ifdef TRACE_INTO_FILE
+
+ _LIT( KDir, "settings" );
+ _LIT( KFile, "settings.txt" );
+ _LIT( KFullPath, "c:\\logs\\settings\\" );
+
+#endif
+
+//-----------------------------------------------------------------------------
+// Error trace macros
+//-----------------------------------------------------------------------------
+//
+#ifdef ERROR_TRACE
+
+ /**
+ * Error trace definitions.
+ */
+ #ifdef TRACE_INTO_FILE
+
+ #define ERROR( aErr, aMsg )\
+ {\
+ if( aErr < KErrNone )\
+ {\
+ RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_ERROR( aMsg ), aErr );\
+ }\
+ }
+ #define ERROR_1( aErr, aMsg, aP1 )\
+ {\
+ if( aErr < KErrNone )\
+ {\
+ RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_ERROR( aMsg ), aErr, aP1 );\
+ }\
+ }
+ #define ERROR_2( aErr, aMsg, aP1, aP2 )\
+ {\
+ if( aErr < KErrNone )\
+ {\
+ RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_ERROR( aMsg ), aErr, aP1, aP2 );\
+ }\
+ }
+ #define ERROR_3( aErr, aMsg, aP1, aP2, aP3 )\
+ {\
+ if( aErr < KErrNone )\
+ {\
+ RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_ERROR( aMsg ), aErr, aP1, aP2, aP3 );\
+ }\
+ }
+ #define ERROR_4( aErr, aMsg, aP1, aP2, aP3, aP4 )\
+ {\
+ if( aErr < KErrNone )\
+ {\
+ RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_ERROR( aMsg ), aErr, aP1, aP2, aP3, aP4 );\
+ }\
+ }
+ #define ERROR_5( aErr, aMsg, aP1, aP2, aP3, aP4, aP5 )\
+ {\
+ if( aErr < KErrNone )\
+ {\
+ RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_ERROR( aMsg ), aErr, aP1, aP2, aP3, aP4, aP5 );\
+ }\
+ }
+ #define ERROR_6( aErr, aMsg, aP1, aP2, aP3, aP4, aP5, aP6 )\
+ {\
+ if( aErr < KErrNone )\
+ {\
+ RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_ERROR( aMsg ), aErr, aP1, aP2, aP3, aP4, aP5 );\
+ }\
+ }
+
+ #else//TRACE_INTO_FILE not defined
+
+ #define ERROR( aErr, aMsg )\
+ {\
+ if( aErr < KErrNone )\
+ {\
+ RDebug::Print( _PREFIX_ERROR( aMsg ), aErr );\
+ }\
+ }
+ #define ERROR_1( aErr, aMsg, aP1 )\
+ {\
+ if( aErr < KErrNone )\
+ {\
+ RDebug::Print( _PREFIX_ERROR( aMsg ), aErr, aP1 );\
+ }\
+ }
+ #define ERROR_2( aErr, aMsg, aP1, aP2 )\
+ {\
+ if( aErr < KErrNone )\
+ {\
+ RDebug::Print( _PREFIX_ERROR( aMsg ), aErr, aP1, aP2 );\
+ }\
+ }
+ #define ERROR_3( aErr, aMsg, aP1, aP2, aP3 )\
+ {\
+ if( aErr < KErrNone )\
+ {\
+ RDebug::Print( _PREFIX_ERROR( aMsg ), aErr, aP1, aP2, aP3 );\
+ }\
+ }
+ #define ERROR_4( aErr, aMsg, aP1, aP2, aP3, aP4 )\
+ {\
+ if( aErr < KErrNone )\
+ {\
+ RDebug::Print( _PREFIX_ERROR( aMsg ), aErr, aP1, aP2, aP3, aP4 );\
+ }\
+ }
+ #define ERROR_5( aErr, aMsg, aP1, aP2, aP3, aP4, aP5 )\
+ {\
+ if( aErr < KErrNone )\
+ {\
+ RDebug::Print( _PREFIX_ERROR( aMsg ), aErr, aP1, aP2, aP3, aP4, aP5 );\
+ }\
+ }
+ #define ERROR_6( aErr, aMsg, aP1, aP2, aP3, aP4, aP5, aP6 )\
+ {\
+ if( aErr < KErrNone )\
+ {\
+ RDebug::Print( _PREFIX_ERROR( aMsg ), aErr, aP1, aP2, aP3, aP4, aP5, aP6 );\
+ }\
+ }
+
+ #endif//TRACE_INTO_FILE
+
+ #define ERROR_GEN( aMsg ) ERROR( KErrGeneral, aMsg )
+ #define ERROR_GEN_1( aMsg, aP1 ) ERROR_1( KErrGeneral, aMsg, aP1 )
+ #define ERROR_GEN_2( aMsg, aP1, aP2 ) ERROR_2( KErrGeneral, aMsg, aP1, aP2 )
+ #define ERROR_GEN_3( aMsg, aP1, aP2, aP3 ) ERROR_3( KErrGeneral, aMsg, aP1, aP3 )
+ #define ERROR_GEN_4( aMsg, aP1, aP2, aP3, aP4 ) ERROR_4( KErrGeneral, aMsg, aP1, aP3, aP4 )
+ #define ERROR_GEN_5( aMsg, aP1, aP2, aP3, aP4, aP5 ) ERROR_5( KErrGeneral, aMsg, aP1, aP3, aP4, aP5 )
+ #define ERROR_GEN_6( aMsg, aP1, aP2, aP3, aP4, aP5, aP6 ) ERROR_6( KErrGeneral, aMsg, aP1, aP3, aP4, aP5, aP6 )
+
+#else//ERROR_TRACE not defined
+
+ #define ERROR( aErr, aMsg )
+ #define ERROR_1( aErr, aMsg, aP1 )
+ #define ERROR_2( aErr, aMsg, aP1, aP2 )
+ #define ERROR_3( aErr, aMsg, aP1, aP2, aP3 )
+ #define ERROR_4( aErr, aMsg, aP1, aP2, aP3, aP4 )
+ #define ERROR_5( aErr, aMsg, aP1, aP2, aP3, aP4, aP5 )
+ #define ERROR_6( aErr, aMsg, aP1, aP2, aP3, aP4, aP5, aP6 )
+
+ #define ERROR_GEN( aMsg )
+ #define ERROR_GEN_1( aMsg, aP1 )
+ #define ERROR_GEN_2( aMsg, aP1, aP2 )
+ #define ERROR_GEN_3( aMsg, aP1, aP2, aP3 )
+ #define ERROR_GEN_4( aMsg, aP1, aP2, aP3, aP4 )
+ #define ERROR_GEN_5( aMsg, aP1, aP2, aP3, aP4, aP5 )
+ #define ERROR_GEN_6( aMsg, aP1, aP2, aP3, aP4, aP5, aP6 )
+
+#endif//ERROR_TRACE
+
+//-----------------------------------------------------------------------------
+// TRAP and trace with error macro
+//-----------------------------------------------------------------------------
+//
+#define TRAP_ERROR( aErr, aFunction )\
+ {\
+ TRAP( aErr, aFunction );\
+ TPtrC8 file( ( TText8* )__FILE__ );\
+ ERROR_2( aErr, "Trapped leave in '%S' line %d", &file, __LINE__);\
+ }
+
+//-----------------------------------------------------------------------------
+// Info trace macros
+//-----------------------------------------------------------------------------
+//
+#ifdef INFO_TRACE
+
+ /**
+ * Info log message definitions.
+ */
+ #ifdef TRACE_INTO_FILE
+
+ #define INFO( aMsg )\
+ {\
+ RFileLogger::Write( KDir, KFile, EFileLoggingModeAppend, _PREFIX_INFO( aMsg ) );\
+ }
+ #define INFO_1( aMsg, aP1 )\
+ {\
+ RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_INFO( aMsg ), aP1 );\
+ }
+ #define INFO_2( aMsg, aP1, aP2 )\
+ {\
+ RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_INFO( aMsg ), aP1, aP2 );\
+ }
+ #define INFO_3( aMsg, aP1, aP2, aP3 )\
+ {\
+ RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_INFO( aMsg ), aP1, aP2, aP3 );\
+ }
+ #define INFO_4( aMsg, aP1, aP2, aP3, aP4 )\
+ {\
+ RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_INFO( aMsg ), aP1, aP2, aP3, aP4 );\
+ }
+ #define INFO_5( aMsg, aP1, aP2, aP3, aP4, aP5 )\
+ {\
+ RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_INFO( aMsg ), aP1, aP2, aP3, aP4, aP5 );\
+ }
+ #define INFO_6( aMsg, aP1, aP2, aP3, aP4, aP5, aP6 )\
+ {\
+ RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_INFO( aMsg ), aP1, aP2, aP3, aP4, aP5, aP6 );\
+ }
+
+ #else//TRACE_INTO_FILE not defined
+
+ #define INFO( aMsg )\
+ {\
+ RDebug::Print( _PREFIX_INFO( aMsg ) );\
+ }
+ #define INFO_1( aMsg, aP1 )\
+ {\
+ RDebug::Print( _PREFIX_INFO( aMsg ), aP1 );\
+ }
+ #define INFO_2( aMsg, aP1, aP2 )\
+ {\
+ RDebug::Print( _PREFIX_INFO( aMsg ), aP1, aP2 );\
+ }
+ #define INFO_3( aMsg, aP1, aP2, aP3 )\
+ {\
+ RDebug::Print( _PREFIX_INFO( aMsg ), aP1, aP2, aP3 );\
+ }
+ #define INFO_4( aMsg, aP1, aP2, aP3, aP4 )\
+ {\
+ RDebug::Print( _PREFIX_INFO( aMsg ), aP1, aP2, aP3, aP4 );\
+ }
+ #define INFO_5( aMsg, aP1, aP2, aP3, aP4, aP5 )\
+ {\
+ RDebug::Print( _PREFIX_INFO( aMsg ), aP1, aP2, aP3, aP4, aP5 );\
+ }
+ #define INFO_6( aMsg, aP1, aP2, aP3, aP4, aP5, aP6 )\
+ {\
+ RDebug::Print( _PREFIX_INFO( aMsg ), aP1, aP2, aP3, aP4, aP5, aP6 );\
+ }
+
+ #endif//TRACE_INTO_FILE
+
+#else//INFO_TRACE not defined
+
+ #define INFO( aMsg )
+ #define INFO_1( aMsg, aP1 )
+ #define INFO_2( aMsg, aP1, aP2 )
+ #define INFO_3( aMsg, aP1, aP2, aP3 )
+ #define INFO_4( aMsg, aP1, aP2, aP3, aP4 )
+ #define INFO_5( aMsg, aP1, aP2, aP3, aP4, aP5 )
+ #define INFO_6( aMsg, aP1, aP2, aP3, aP4, aP5, aP6 )
+
+#endif//INFO_TRACE
+
+//-----------------------------------------------------------------------------
+// Trace current client thread name and process id
+//-----------------------------------------------------------------------------
+//
+#ifdef CLIENT_TRACE
+
+ #define CLIENT_PROCESS\
+ {\
+ CLIENT_PROCESS_PREFIX( "" );\
+ }
+
+ #define CLIENT_PROCESS_PREFIX( aPrefix )\
+ {\
+ RProcess process;\
+ TPtrC name( process.Name() );\
+ TSecureId sid( process.SecureId() );\
+ TPtrC prefix( _S( aPrefix ) );\
+ if( prefix.Length() )\
+ {\
+ INFO_3( "%S: CLIENT - Name: [%S], Sid: [0x%x]", &prefix, &name, sid.iId );\
+ }\
+ else\
+ {\
+ INFO_2( "CLIENT - Name: [%S], Sid: [0x%x]", &name, sid.iId );\
+ }\
+ process.Close();\
+ }
+
+ #define CLIENT_MESSAGE( aMsg )\
+ {\
+ CLIENT_MESSAGE_PREFIX( "", aMsg );\
+ }
+
+ #define CLIENT_MESSAGE_PREFIX( aPrefix, aMsg )\
+ {\
+ RThread thread;\
+ TInt err = aMsg.Client( thread );\
+ if( err == KErrNone )\
+ {\
+ RProcess process;\
+ err = thread.Process( process );\
+ if( err == KErrNone )\
+ {\
+ TPtrC threadName( thread.Name() );\
+ TUid processUid( process.SecureId() );\
+ TPtrC prefix( _S( aPrefix ) );\
+ if( prefix.Length() )\
+ {\
+ INFO_4( "%S: MSG - Name: [%S], Sid: [0x%x], Message ID: [%d]",\
+ &prefix,\
+ &threadName,\
+ processUid,\
+ aMsg.Function() );\
+ }\
+ else\
+ {\
+ INFO_3( "MSG - Name: [%S], Sid: [0x%x], Message ID: [%d]",\
+ &threadName,\
+ processUid,\
+ aMsg.Function() );\
+ }\
+ }\
+ process.Close();\
+ }\
+ thread.Close();\
+ }
+
+#else
+
+ #define CLIENT_PROCESS
+ #define CLIENT_PROCESS_PREFIX( aPrefix )
+ #define CLIENT_MESSAGE( aMsg )
+ #define CLIENT_MESSAGE_PREFIX( aPrefix, aMsg )
+
+#endif
+
+//-----------------------------------------------------------------------------
+// Function trace macros
+//-----------------------------------------------------------------------------
+//
+#ifdef FUNC_TRACE
+
+ /**
+ * Function logging definitions.
+ */
+ #ifdef TRACE_INTO_FILE
+
+ #define FUNC( aMsg, aP1 )\
+ {\
+ TPtrC8 trace( _S8( aMsg ) );\
+ RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, trace, aP1 );\
+ }\
+
+ #else//TRACE_INTO_FILE not defined
+
+ #define FUNC( aMsg, aP1 )\
+ {\
+ RDebug::Printf( aMsg, aP1 );\
+ }\
+
+ #endif//TRACE_INTO_FILE
+
+ /**
+ * Function trace helper class.
+ *
+ * NOTE:
+ * LC -methods cannot be trapped. Therefore if LC -method leaves
+ * END trace is used instead of LEAVE trace.
+ * If you have an idea how to round this problem please tell.
+ */
+ _LIT8( KFuncNameTerminator, "(" );
+ _LIT8( KFuncLeavePatternL, "L" );
+ class TFuncLog
+ {
+ public:
+ static void Cleanup( TAny* aPtr )
+ {
+ TFuncLog* self = static_cast< TFuncLog* >( aPtr );
+ self->iLeft = ETrue;
+ FUNC( _PREFIX_CHAR("%S-LEAVE"), &self->iFunc ); // Leave detected
+ }
+ inline TFuncLog( const char* aFunc ) :
+ iFunc( aFunc ? _S8( aFunc ) : _S8("") ),
+ iLeft( EFalse ),
+ iCleanupItem( Cleanup, this ),
+ iCanLeave( EFalse )
+ {
+ TInt pos( iFunc.Find( KFuncNameTerminator ) );
+ if( pos != KErrNotFound )
+ {
+ iFunc.Set( iFunc.Left( pos ) );
+ iCanLeave = !iFunc.Right( KFuncLeavePatternL().Length() ).Compare( KFuncLeavePatternL );
+ if ( iCanLeave )
+ {
+ CleanupStack::PushL( iCleanupItem ); // Ignore warnings
+ }
+ }
+ FUNC( _PREFIX_CHAR("%S-START"), &iFunc );
+ }
+
+ inline ~TFuncLog()
+ {
+ if ( !iLeft )
+ {
+ if ( iCanLeave )
+ {
+ CleanupStack::Pop( this ); // Pop the cleanup item
+ }
+ FUNC( _PREFIX_CHAR("%S-END"), &iFunc ); // Normally finished
+ }
+ }
+
+ private: // Data
+ TPtrC8 iFunc;
+ TBool iLeft;
+ TCleanupItem iCleanupItem;
+ TBool iCanLeave;
+ };
+ #define FUNC_LOG TFuncLog _fl( __PRETTY_FUNCTION__ );
+
+#else//FUNC_TRACE not defined
+
+ #define FUNC_LOG
+
+#endif//FUNC_TRACE
+
+//-----------------------------------------------------------------------------
+// Timestamp trace macros
+//-----------------------------------------------------------------------------
+//
+#ifdef TIMESTAMP_TRACE
+
+ #ifdef TRACE_INTO_FILE
+
+ #define TIMESTAMP( aCaption )\
+ {\
+ TTime t;\
+ t.HomeTime();\
+ TDateTime dt = t.DateTime();\
+ _LIT( KCaption, aCaption );\
+ RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend,\
+ _PREFIX_TRACE("[TIMESTAMP] %S %d:%02d:%02d.%d us"),\
+ &KCaption, dt.Hour(), dt.Minute(), dt.Second(), dt.MicroSecond() );\
+ }
+
+ #else//TRACE_INTO_FILE not defined
+
+ #define TIMESTAMP( aCaption )\
+ {\
+ TTime t;\
+ t.HomeTime();\
+ TDateTime dt = t.DateTime();\
+ _LIT( KCaption, aCaption );\
+ RDebug::Print( _PREFIX_TRACE("[TIMESTAMP] %S %d:%02d:%02d.%d us"),\
+ &KCaption, dt.Hour(), dt.Minute(), dt.Second(), dt.MicroSecond() );\
+ }
+
+ #endif//TRACE_INTO_FILE
+
+#else//TIMESTAMP_TRACE not defined
+
+ #define TIMESTAMP( aCaption )
+
+#endif//TIMESTAMP_TRACE
+
+#ifdef HEAP_TRACE
+
+ #ifdef TRACE_INTO_FILE
+
+ #define HEAP( aMsg )\
+ {\
+ TInt totalAllocSpace = 0;\
+ User::AllocSize( totalAllocSpace );\
+ RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_HEAP( aMsg ), totalAllocSpace );\
+ }
+ #define HEAP_1( aMsg, aP1 )\
+ {\
+ TInt totalAllocSpace = 0;\
+ User::AllocSize( totalAllocSpace );\
+ RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_HEAP( aMsg ), totalAllocSpace, aP1 );\
+ }
+ #define HEAP_2( aMsg, aP1, aP2 )\
+ {\
+ TInt totalAllocSpace = 0;\
+ User::AllocSize( totalAllocSpace );\
+ RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_HEAP( aMsg ), totalAllocSpace, aP1, aP2 );\
+ }
+ #define HEAP_3( aMsg, aP1, aP2, aP3 )\
+ {\
+ TInt totalAllocSpace = 0;\
+ User::AllocSize( totalAllocSpace );\
+ RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_HEAP( aMsg ), totalAllocSpace, aP1, aP2, aP3 );\
+ }
+ #define HEAP_4( aMsg, aP1, aP2, aP3, aP4 )\
+ {\
+ TInt totalAllocSpace = 0;\
+ User::AllocSize( totalAllocSpace );\
+ RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_HEAP( aMsg ), totalAllocSpace, aP1, aP2, aP3, aP4 );\
+ }
+
+ #else//TRACE_INTO_FILE not defined
+
+ #define HEAP( aMsg )\
+ {\
+ TInt totalAllocSpace = 0;\
+ User::AllocSize( totalAllocSpace );\
+ RDebug::Print( _PREFIX_HEAP( aMsg ), totalAllocSpace );\
+ }
+ #define HEAP_1( aMsg, aP1 )\
+ {\
+ TInt totalAllocSpace = 0;\
+ User::AllocSize( totalAllocSpace );\
+ RDebug::Print( _PREFIX_HEAP( aMsg ), totalAllocSpace, aP1 );\
+ }
+ #define HEAP_2( aMsg, aP1, aP2 )\
+ {\
+ TInt totalAllocSpace = 0;\
+ User::AllocSize( totalAllocSpace );\
+ RDebug::Print( _PREFIX_HEAP( aMsg ), totalAllocSpace, aP1, aP2 );\
+ }
+ #define HEAP_3( aMsg, aP1, aP2, aP3 )\
+ {\
+ TInt totalAllocSpace = 0;\
+ User::AllocSize( totalAllocSpace );\
+ RDebug::Print( _PREFIX_HEAP( aMsg ), totalAllocSpace, aP1, aP2, aP3 );\
+ }
+ #define HEAP_4( aMsg, aP1, aP2, aP3, aP4 )\
+ {\
+ TInt totalAllocSpace = 0;\
+ User::AllocSize( totalAllocSpace );\
+ RDebug::Print( _PREFIX_HEAP( aMsg ), totalAllocSpace, aP1, aP2, aP3, aP4 );\
+ }
+
+ #endif//TRACE_INTO_FILE
+
+#else//HEAP_TRACE not defined
+
+ #define HEAP( aMsg )
+ #define HEAP_1( aMsg, aP1 )
+ #define HEAP_2( aMsg, aP1, aP2 )
+ #define HEAP_3( aMsg, aP1, aP2, aP3 )
+ #define HEAP_4( aMsg, aP1, aP2, aP3, aP4 )
+
+#endif//HEAP_TRACE
+
+#endif
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioengine/settings/tsrc/inc/traceconfiguration.hrh Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,78 @@
+/*
+* Copyright (C) 2009 Nokia Corporation And/Or Its Subsidiary(-Ies).
+* All Rights Reserved.
+* This Component And The Accompanying Materials Are Made Available
+* Under The Terms Of The License "Symbian Foundation License V1.0"
+* Which Accompanies This Distribution, And Is Available
+* At The Url "Http://Www.Symbianfoundation.Org/Legal/Sfl-V10.Html".
+*
+* Initial Contributors:
+* Nokia Corporation - Initial Contribution.
+*
+* Contributors:
+*
+* Description:
+* Trace Macro Configurations.
+*
+*/
+
+#ifndef TRACECONFIGURATION_HRH
+#define TRACECONFIGURATION_HRH
+
+//-----------------------------------------------------------------------------
+// Trace definitions
+//-----------------------------------------------------------------------------
+//
+
+/**
+* Error trace enabled
+*/
+#ifdef _DEBUG
+ #define ERROR_TRACE
+#else
+ #undef ERROR_TRACE
+#endif
+
+/**
+* Info trace enabled
+*/
+#ifdef _DEBUG
+ #define INFO_TRACE
+#else
+ #undef INFO_TRACE
+#endif
+
+/**
+* Timestamp tracing on
+*/
+#ifdef _DEBUG
+ #define TIMESTAMP_TRACE
+#else
+ #undef TIMESTAMP_TRACE
+#endif
+
+/**
+* Tracing current client process and thread
+*/
+#ifdef _DEBUG
+ #define CLIENT_TRACE
+#else
+ #undef CLIENT_TRACE
+#endif
+
+/**
+* Function trace enabled
+*/
+#ifdef _DEBUG
+ #define FUNC_TRACE
+#else
+ #undef FUNC_TRACE
+#endif
+
+/**
+* Tracing into file enabled, default RDebug
+*/
+#undef TRACE_INTO_FILE
+
+#endif
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioengine/settings/tsrc/init/TestFramework.ini Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,197 @@
+#
+# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+#
+# This is STIFTestFramework initialization file
+# Comment lines start with '#'-character.
+# See STIF TestFramework users guide.doc for instructions
+
+# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
+# Set following test engine settings:
+# - Set Test Reporting mode. TestReportMode's possible values are:
+# + 'Summary': Summary of the tested test cases.
+# + 'Environment': Hardware and software info.
+# + 'TestCases': Test case report.
+# + 'FullReport': Set of all above ones.
+# + Example 'TestReportMode= Summary TestCases'
+#
+# - CreateTestReport setting controls report creation mode
+# + YES, Test report will created.
+# + NO, No Test report.
+#
+# - File path indicates the base path of the test report.
+# - File name indicates the name of the test report.
+#
+# - File format indicates the type of the test report.
+# + TXT, Test report file will be txt type, for example 'TestReport.txt'.
+# + HTML, Test report will be html type, for example 'TestReport.html'.
+#
+# - File output indicates output source of the test report.
+# + FILE, Test report logging to file.
+# + RDEBUG, Test report logging to using rdebug.
+#
+# - File Creation Mode indicates test report overwriting if file exist.
+# + OVERWRITE, Overwrites if the Test report file exist.
+# + APPEND, Continue logging after the old Test report information if
+# report exist.
+# - Sets a device reset module's dll name(Reboot).
+# + If Nokia specific reset module is not available or it is not correct one
+# StifHWResetStub module may use as a template for user specific reset
+# module.
+# - Sets STIF test measurement disable options. e.g. pluging1 and pluging2 disablation
+# DisableMeasurement= stifmeasurementplugin01 stifmeasurementplugin02
+#
+
+[Engine_Defaults]
+
+TestReportMode= FullReport # Possible values are: 'Empty', 'Summary', 'Environment', 'TestCases' or 'FullReport'
+
+CreateTestReport= YES # Possible values: YES or NO
+
+TestReportFilePath= c:\LOGS\TestFramework\
+TestReportFileName= TestReport
+
+TestReportFormat= TXT # Possible values: TXT or HTML
+TestReportOutput= FILE # Possible values: FILE or RDEBUG
+TestReportFileCreationMode= OVERWRITE # Possible values: OVERWRITE or APPEND
+
+DeviceResetDllName= StifResetForNokia.dll # e.g. 'StifHWResetStub.dll' for user specific reseting
+
+DisableMeasurement= stifmeasurementdisablenone # Possible values are:
+ # 'stifmeasurementdisablenone', 'stifmeasurementdisableall'
+ # 'stifmeasurementplugin01', 'stifmeasurementplugin02',
+ # 'stifmeasurementplugin03', 'stifmeasurementplugin04',
+ # 'stifmeasurementplugin05' or 'stifbappeaprofiler'
+
+[End_Defaults]
+# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
+
+
+
+# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
+# Module configurations start
+# Modules are added between module tags
+# tags. Module name is specified after ModuleName= tag, like
+# ModuleName= XXXXXXXXX
+# Modules might have initialisation file, specified as
+# IniFile= c:\testframework\YYYYYY
+# Modules might have several configuration files, like
+# TestCaseFile= c:\testframework\NormalCases.txt
+# TestCaseFile= c:\testframework\SmokeCases.txt
+# TestCaseFile= c:\testframework\ManualCases.txt
+
+# (TestCaseFile is synonym for old term ConfigFile)
+
+# Following case specifies demo module settings. Demo module
+# does not read any settings from file, so tags
+# IniFile and TestCaseFile are not used.
+# In the simplest case it is enough to specify only the
+# name of the test module when adding new test module
+[New_Module]
+ModuleName= TestScripter
+TestCaseFile= c:\testframework\SettingsTestModule.cfg
+[End_Module]
+
+# Load testmoduleXXX, optionally with initialization file and/or test case files
+#[New_Module]
+#ModuleName= testmodulexxx
+
+#TestModuleXXX used initialization file
+#IniFile= c:\testframework\init.txt
+
+#TestModuleXXX used configuration file(s)
+#TestCaseFile= c:\testframework\testcases1.cfg
+#TestCaseFile= c:\testframework\testcases2.cfg
+#TestCaseFile= c:\testframework\manualtestcases.cfg
+
+#[End_Module]
+# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
+
+
+
+# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
+# Set STIFTestFramework logging overwrite parameters for Logger.
+# Hardware and emulator environment logging path and styles can
+# be configured from here to overwrite the Logger's implemented values.
+#
+# Settings description:
+# - Indicates option for creation log directory/directories. If log directory/directories
+# is/are not created by user they will make by software.
+# + YES, Create log directory/directories if not allready exist.
+# + NO, Log directory/directories not created. Only created one is used.
+#
+# - Overwrite emulator path setting.
+# + Example: If 'EmulatorBasePath= C:\LOGS\TestFramework\' and in code is defined
+# Logger's path 'D:\LOGS\Module\' with those definition the path
+# will be 'C:\LOGS\TestFramework\LOGS\Module\'
+#
+# - Overwrite emulator's logging format.
+# + TXT, Log file(s) will be txt type(s), for example 'Module.txt'.
+# + HTML, Log file(s) will be html type(s), for example 'Module.html'.
+#
+# - Overwrited emulator logging output source.
+# + FILE, Logging to file(s).
+# + RDEBUG, Logging to using rdebug(s).
+#
+# - Overwrite hardware path setting (Same description as above in emulator path).
+# - Overwrite hardware's logging format(Same description as above in emulator format).
+# - Overwrite hardware's logging output source(Same description as above in emulator output).
+#
+# - File Creation Mode indicates file overwriting if file exist.
+# + OVERWRITE, Overwrites if file(s) exist.
+# + APPEND, Continue logging after the old logging information if file(s) exist.
+#
+# - Will thread id include to the log filename.
+# + YES, Thread id to log file(s) name, Example filename 'Module_b9.txt'.
+# + NO, No thread id to log file(s), Example filename 'Module.txt'.
+#
+# - Will time stamps include the to log file.
+# + YES, Time stamp added to each line in log file(s). Time stamp is
+# for example'12.Nov.2003 115958 LOGGING INFO'
+# + NO, No time stamp(s).
+#
+# - Will line breaks include to the log file.
+# + YES, Each logging event includes line break and next log event is in own line.
+# + NO, No line break(s).
+#
+# - Will event ranking include to the log file.
+# + YES, Event ranking number added to each line in log file(s). Ranking number
+# depends on environment's tics, for example(includes time stamp also)
+# '012 12.Nov.2003 115958 LOGGING INFO'
+# + NO, No event ranking.
+#
+
+[Logger_Defaults]
+
+#NOTE: If you want to set Logger using next setting(s) remove comment(s)'#'
+#NOTE: TestEngine and TestServer logging settings cannot change here
+
+#CreateLogDirectories= YES # Possible values: YES or NO
+
+#EmulatorBasePath= C:\LOGS\TestFramework\
+#EmulatorFormat= HTML # Possible values: TXT or HTML
+#EmulatorOutput= FILE # Possible values: FILE or RDEBUG
+
+#HardwareBasePath= D:\LOGS\TestFramework\
+#HardwareFormat= HTML # Possible values: TXT or HTML
+#HardwareOutput= FILE # Possible values: FILE or RDEBUG
+
+#FileCreationMode= OVERWRITE # Possible values: OVERWRITE or APPEND
+
+#ThreadIdToLogFile= YES # Possible values: YES or NO
+#WithTimeStamp= YES # Possible values: YES or NO
+#WithLineBreak= YES # Possible values: YES or NO
+#WithEventRanking= YES # Possible values: YES or NO
+
+[End_Logger_Defaults]
+# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
+
+# End of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioengine/settings/tsrc/rom/settingstestmodule.iby Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,13 @@
+
+#ifndef __SETTINGSTESTMODULE_IBY__
+#define __SETTINGSTESTMODULE_IBY__
+
+// Use standard macros
+#include <data_caging_paths_for_iby.hrh>
+
+
+file=ABI_DIR\BUILD_DIR\settingstestmodule.dll SHARED_LIB_DIR\settingstestmodule.dll PAGED
+
+#endif
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioengine/settings/tsrc/src/SettingsTestModule.cpp Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,207 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: This file contains testclass implementation.
+*
+*/
+
+// INCLUDE FILES
+#include <Stiftestinterface.h>
+#include <SettingServerClient.h>
+#include "SettingsTestModule.h"
+#include "trace.h"
+
+// EXTERNAL DATA STRUCTURES
+//extern ?external_data;
+
+// EXTERNAL FUNCTION PROTOTYPES
+//extern ?external_function( ?arg_type,?arg_type );
+
+// CONSTANTS
+//const ?type ?constant_var = ?constant;
+
+// MACROS
+//#define ?macro ?macro_def
+
+// LOCAL CONSTANTS AND MACROS
+//const ?type ?constant_var = ?constant;
+//#define ?macro_name ?macro_def
+
+// MODULE DATA STRUCTURES
+//enum ?declaration
+//typedef ?declaration
+
+// LOCAL FUNCTION PROTOTYPES
+//?type ?function_name( ?arg_type, ?arg_type );
+
+// FORWARD DECLARATIONS
+//class ?FORWARD_CLASSNAME;
+
+// ============================= LOCAL FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// ?function_name ?description.
+// ?description
+// Returns: ?value_1: ?description
+// ?value_n: ?description_line1
+// ?description_line2
+// -----------------------------------------------------------------------------
+//
+/*
+?type ?function_name(
+ ?arg_type arg, // ?description
+ ?arg_type arg) // ?description
+ {
+
+ ?code // ?comment
+
+ // ?comment
+ ?code
+ }
+*/
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// CSettingTestModule::CPresetUtilityTestModule
+// C++ default constructor can NOT contain any code, that
+// might leave.
+// -----------------------------------------------------------------------------
+//
+CSettingsTestModule::CSettingsTestModule(
+ CTestModuleIf& aTestModuleIf ):
+ CScriptBase( aTestModuleIf )
+ {
+ FUNC_LOG;
+ }
+
+// -----------------------------------------------------------------------------
+// CSettingsTestModule::ConstructL
+// Symbian 2nd phase constructor can leave.
+// -----------------------------------------------------------------------------
+//
+void CSettingsTestModule::ConstructL()
+ {
+ FUNC_LOG;
+
+ //Read logger settings to check whether test case name is to be
+ //appended to log file name.
+ RSettingServer settingServer;
+ TInt ret = settingServer.Connect();
+ if(ret != KErrNone)
+ {
+ User::Leave(ret);
+ }
+ // Struct to StifLogger settigs.
+ TLoggerSettings loggerSettings;
+ // Parse StifLogger defaults from STIF initialization file.
+ ret = settingServer.GetLoggerSettings(loggerSettings);
+ if(ret != KErrNone)
+ {
+ User::Leave(ret);
+ }
+ // Close Setting server session
+ settingServer.Close();
+
+ TFileName logFileName;
+
+ if(loggerSettings.iAddTestCaseTitle)
+ {
+ TName title;
+ TestModuleIf().GetTestCaseTitleL(title);
+ logFileName.Format(KSettingsTestModuleLogFileWithTitle, &title);
+ }
+ else
+ {
+ logFileName.Copy(KSettingsTestModuleLogFile);
+ }
+
+ iLog = CStifLogger::NewL( KSettingsTestModuleLogPath,
+ logFileName,
+ CStifLogger::ETxt,
+ CStifLogger::EFile,
+ EFalse );
+
+ SendTestClassVersion();
+ }
+
+// -----------------------------------------------------------------------------
+// CSettingsTestModule::NewL
+// Two-phased constructor.
+// -----------------------------------------------------------------------------
+//
+CSettingsTestModule* CSettingsTestModule::NewL(
+ CTestModuleIf& aTestModuleIf )
+ {
+ FUNC_LOG;
+ CSettingsTestModule* self = new (ELeave) CSettingsTestModule( aTestModuleIf );
+
+ CleanupStack::PushL( self );
+ self->ConstructL();
+ CleanupStack::Pop();
+
+ return self;
+
+ }
+
+// Destructor
+CSettingsTestModule::~CSettingsTestModule()
+ {
+ FUNC_LOG;
+
+ // Delete resources allocated from test methods
+ Delete();
+
+ // Delete logger
+ delete iLog;
+
+ }
+
+//-----------------------------------------------------------------------------
+// CSettingsTestModule::SendTestClassVersion
+// Method used to send version of test class
+//-----------------------------------------------------------------------------
+//
+void CSettingsTestModule::SendTestClassVersion()
+ {
+ FUNC_LOG;
+ TVersion moduleVersion;
+ moduleVersion.iMajor = TEST_CLASS_VERSION_MAJOR;
+ moduleVersion.iMinor = TEST_CLASS_VERSION_MINOR;
+ moduleVersion.iBuild = TEST_CLASS_VERSION_BUILD;
+
+ TFileName moduleName;
+ moduleName = _L("SettingsTestModule.dll");
+
+ TBool newVersionOfMethod = ETrue;
+ TestModuleIf().SendTestModuleVersion(moduleVersion, moduleName, newVersionOfMethod);
+ }
+
+// ========================== OTHER EXPORTED FUNCTIONS =========================
+
+// -----------------------------------------------------------------------------
+// LibEntryL is a polymorphic Dll entry point.
+// Returns: CScriptBase: New CScriptBase derived object
+// -----------------------------------------------------------------------------
+//
+EXPORT_C CScriptBase* LibEntryL(
+ CTestModuleIf& aTestModuleIf ) // Backpointer to STIF Test Framework
+ {
+ FUNC_LOG;
+
+ return ( CScriptBase* ) CSettingsTestModule::NewL( aTestModuleIf );
+
+ }
+
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioengine/settings/tsrc/src/SettingsTestModuleBlocks.cpp Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,1203 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: This file contains testclass implementation.
+*
+*/
+
+// [INCLUDE FILES] - do not remove
+#include <e32svr.h>
+#include <e32cmn.h>
+#include <StifParser.h>
+#include <Stiftestinterface.h>
+#include <data_caging_path_literals.hrh>
+#include <centralrepository.h>
+
+#include "SettingsTestModule.h"
+#include "cradiosettings.h"
+#include "cradiosettingsimp.h"
+#include "mradiosettingssetter.h"
+#include "mradioapplicationsettings.h"
+#include "mradioenginesettings.h"
+#include "radiointernalcrkeys.h"
+#include "radioengineutils.h"
+
+// EXTERNAL DATA STRUCTURES
+//extern ?external_data;
+
+// EXTERNAL FUNCTION PROTOTYPES
+//extern ?external_function( ?arg_type,?arg_type );
+
+// CONSTANTS
+//const ?type ?constant_var = ?constant;
+//_LIT( KStifScriptEmptyString, "EMPTYSTRING" );
+//_LIT( KEmptyString, "" );
+
+// MACROS
+//#define ?macro ?macro_def
+
+// LOCAL CONSTANTS AND MACROS
+//const ?type ?constant_var = ?constant;
+//#define ?macro_name ?macro_def
+
+// MODULE DATA STRUCTURES
+//enum ?declaration
+//typedef ?declaration
+
+// LOCAL FUNCTION PROTOTYPES
+//?type ?function_name( ?arg_type, ?arg_type );
+
+// FORWARD DECLARATIONS
+//class ?FORWARD_CLASSNAME;
+
+// ============================= LOCAL FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// ?function_name ?description.
+// ?description
+// Returns: ?value_1: ?description
+// ?value_n: ?description_line1
+// ?description_line2
+// -----------------------------------------------------------------------------
+//
+/*
+?type ?function_name(
+ ?arg_type arg, // ?description
+ ?arg_type arg) // ?description
+ {
+
+ ?code // ?comment
+
+ // ?comment
+ ?code
+ }
+*/
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// CPresetUtilityTestModule::Delete
+// Delete here all resources allocated and opened from test methods.
+// Called from destructor.
+// -----------------------------------------------------------------------------
+//
+void CSettingsTestModule::Delete()
+ {
+ FUNC_LOG;
+
+ }
+
+// -----------------------------------------------------------------------------
+// CSettingsTestModule::RunMethodL
+// Run specified method. Contains also table of test mothods and their names.
+// -----------------------------------------------------------------------------
+//
+TInt CSettingsTestModule::RunMethodL(
+ CStifItemParser& aItem )
+ {
+ FUNC_LOG;
+
+ static TStifFunctionInfo const KFunctions[] =
+ {
+ // Copy this line for every implemented function.
+ // First string is the function name used in TestScripter script file.
+ // Second is the actual implementation member function.
+ ENTRY( "Example", CSettingsTestModule::ExampleL ),
+ // [test cases entries] - Do not remove
+ ENTRY( "CreateSettingsL", CSettingsTestModule::CreateSettingsL ),
+ ENTRY( "DestroySettingsL", CSettingsTestModule::DestroySettingsL ),
+ ENTRY( "IsRegionAllowed", CSettingsTestModule::IsRegionAllowed ),
+ ENTRY( "ResolveDriveL", CSettingsTestModule::ResolveDriveL ),
+ ENTRY( "SetFirstTimeStartPerformed", CSettingsTestModule::SetFirstTimeStartPerformed ),
+ ENTRY( "IsFirstTimeStart", CSettingsTestModule::IsFirstTimeStart ),
+ ENTRY( "SetUiFlags", CSettingsTestModule::SetUiFlags ),
+ ENTRY( "UiFlags", CSettingsTestModule::UiFlags ),
+ ENTRY( "HeadsetVolume", CSettingsTestModule::HeadsetVolume ),
+ ENTRY( "SpeakerVolume", CSettingsTestModule::SpeakerVolume ),
+ ENTRY( "Volume", CSettingsTestModule::Volume ),
+ ENTRY( "OutputMode", CSettingsTestModule::OutputMode ),
+ ENTRY( "AudioRoute", CSettingsTestModule::AudioRoute ),
+ ENTRY( "IsHeadsetVolMuted", CSettingsTestModule::IsHeadsetVolMuted ),
+ ENTRY( "IsSpeakerVolMuted", CSettingsTestModule::IsSpeakerVolMuted ),
+ ENTRY( "IsVolMuted", CSettingsTestModule::IsVolMuted ),
+ ENTRY( "IsPowerOn", CSettingsTestModule::IsPowerOn ),
+ ENTRY( "TunedFrequency", CSettingsTestModule::TunedFrequency ),
+ ENTRY( "DefaultMinVolumeLevel", CSettingsTestModule::DefaultMinVolumeLevel ),
+ ENTRY( "CountRegions", CSettingsTestModule::CountRegions ),
+ ENTRY( "Region", CSettingsTestModule::Region ),
+ ENTRY( "RegionId", CSettingsTestModule::RegionId ),
+ ENTRY( "FrequencyStepSize", CSettingsTestModule::FrequencyStepSize ),
+ ENTRY( "MaxFrequency", CSettingsTestModule::MaxFrequency ),
+ ENTRY( "MinFrequency", CSettingsTestModule::MinFrequency ),
+ ENTRY( "DecimalCount", CSettingsTestModule::DecimalCount ),
+ ENTRY( "DefaultRegion", CSettingsTestModule::DefaultRegion ),
+ ENTRY( "NetworkId", CSettingsTestModule::NetworkId ),
+ ENTRY( "CountryCode", CSettingsTestModule::CountryCode ),
+ ENTRY( "SetHeadsetVolume", CSettingsTestModule::SetHeadsetVolume ),
+ ENTRY( "SetSpeakerVolume", CSettingsTestModule::SetSpeakerVolume ),
+ ENTRY( "SetVolume", CSettingsTestModule::SetVolume ),
+ ENTRY( "SetOutputMode", CSettingsTestModule::SetOutputMode ),
+ ENTRY( "SetAudioRoute", CSettingsTestModule::SetAudioRoute ),
+ ENTRY( "SetHeadsetVolMuted", CSettingsTestModule::SetHeadsetVolMuted ),
+ ENTRY( "SetSpeakerVolMuted", CSettingsTestModule::SetSpeakerVolMuted ),
+ ENTRY( "SetVolMuted", CSettingsTestModule::SetVolMuted ),
+ ENTRY( "SetPowerOn", CSettingsTestModule::SetPowerOn ),
+ ENTRY( "SetTunedFrequency", CSettingsTestModule::SetTunedFrequency ),
+ ENTRY( "SetRegionId", CSettingsTestModule::SetRegionId ),
+ ENTRY( "SetCountryCode", CSettingsTestModule::SetCountryCode ),
+ ENTRY( "SetNetworkId", CSettingsTestModule::SetNetworkId ),
+ ENTRY( "tstSetRegionIdL", CSettingsTestModule::tstSetRegionIdL ),
+ ENTRY( "tstResetStartCount", CSettingsTestModule::tstResetStartCount ),
+ ENTRY( "ReadConfigurableKeysL", CSettingsTestModule::ReadConfigurableKeysL )
+ //ADD NEW ENTRY HERE
+
+ };
+
+ const TInt count = sizeof( KFunctions ) /
+ sizeof( TStifFunctionInfo );
+
+ return RunInternalL( KFunctions, count, aItem );
+
+ }
+
+// -----------------------------------------------------------------------------
+// CSettingsTestModule::ExampleL
+// Example test method function.
+// (other items were commented in a header).
+// -----------------------------------------------------------------------------
+//
+TInt CSettingsTestModule::ExampleL( CStifItemParser& aItem )
+ {
+ FUNC_LOG;
+
+ // Print to UI
+ _LIT( KSettingsTestModule, "SettingsTestModule" );
+ _LIT( KExample, "In Example" );
+ TestModuleIf().Printf( 0, KSettingsTestModule, KExample );
+ // Print to log file
+ iLog->Log( KExample );
+
+ TInt i = 0;
+ TPtrC string;
+ _LIT( KParam, "Param[%i]: %S" );
+ while ( aItem.GetNextString ( string ) == KErrNone )
+ {
+ TestModuleIf().Printf( i, KSettingsTestModule,
+ KParam, i, &string );
+ i++;
+ }
+
+ return KErrNone;
+
+ }
+
+//-----------------------------------------------------------------------------
+// CPresetUtilityTest::CreateSettingsL
+//-----------------------------------------------------------------------------
+TInt CSettingsTestModule::CreateSettingsL(
+ CStifItemParser& /*aItem*/ )
+ {
+ FUNC_LOG;
+
+ TInt err = KErrNone;
+ if( !iSettings )
+ {
+ RadioEngineUtils::InitializeL();
+ TRAPD( err, iSettings = CRadioSettings::NewL() );
+ if ( KErrNone == err )
+ {
+ iSettings->RadioSetter().SetObserver( this );
+ }
+ else
+ {
+ RadioEngineUtils::Release();
+ INFO_1( "CRadioSettings::NewL() failed err = %i", err )
+ User::Leave(err );
+ }
+ }
+ else
+ {
+ err = KErrArgument;
+ }
+
+ return err;
+ }
+
+
+//-----------------------------------------------------------------------------
+// CSettingsTestModule::DestroyiSettingsL
+//-----------------------------------------------------------------------------
+TInt CSettingsTestModule::DestroySettingsL(
+ CStifItemParser& /*aItem*/ )
+ {
+ FUNC_LOG;
+
+ delete iSettings;
+ iSettings = NULL;
+ RadioEngineUtils::Release();
+ return KErrNone;
+ }
+
+
+// -----------------------------------------------------------------------------
+// CSettingsTestModule::ResolveDriveL()
+// Returns: Errors.
+// -----------------------------------------------------------------------------
+TInt CSettingsTestModule::ResolveDriveL( CStifItemParser& /*aItem*/ )
+{
+ FUNC_LOG;
+ TFileName resourceFileName;
+ resourceFileName.Append( KRadioSettingsResourceFile );
+ iSettings->ResolveDriveL( resourceFileName, KDC_RESOURCE_FILES_DIR );
+ return KErrNone;
+}
+
+
+// -----------------------------------------------------------------------------
+// CSettingsTestModule::IsRegionAllowed()
+// Returns: Errors.
+// -----------------------------------------------------------------------------
+TInt CSettingsTestModule::IsRegionAllowed( CStifItemParser& /*aItem*/ )
+{
+ FUNC_LOG;
+ TRadioRegion regionId( iSettings->EngineSettings().RegionId() );
+ TUint currentAllowedStatus( iSettings->IsRegionAllowed( regionId ) );
+ TInt err( KErrNone);
+ INFO_1( "Failed: currentAllowedStatus=%i", currentAllowedStatus );
+ return err;
+
+}
+
+
+// -----------------------------------------------------------------------------
+// CSettingsTestModule::IsFirstTimeStart()
+// Returns: Errors.
+// -----------------------------------------------------------------------------
+TInt CSettingsTestModule::IsFirstTimeStart( CStifItemParser& aItem )
+{
+ FUNC_LOG;
+ TInt err( KErrNone);
+ TBool expectedFirstTimeStartStatus( EFalse );
+ // read parameters
+ if ( aItem.GetNextInt(expectedFirstTimeStartStatus) )
+ {
+ err = KErrBadTestParameter;
+ ERROR( err, "Missing Parameter: expectedFirstTimeStartStatus." );
+ }
+ TBool firstTimeStartStatus( iSettings->ApplicationSettings().IsFirstTimeStart() );
+ if ( expectedFirstTimeStartStatus != firstTimeStartStatus )
+ {
+ INFO_2( "Failed: firstTimeStartStatus=%i, expectedFirstTimeStartStatus=%i.", firstTimeStartStatus, expectedFirstTimeStartStatus );
+ err = KErrUnexpectedValue;
+ }
+ return err;
+}
+
+// -----------------------------------------------------------------------------
+// CSettingsTestModule::SetFirstTimeStart()
+// Returns: Errors.
+// -----------------------------------------------------------------------------
+TInt CSettingsTestModule::SetFirstTimeStartPerformed( CStifItemParser& aItem )
+{
+ FUNC_LOG;
+ TInt err( KErrNone );
+ TBool firstTimeStartPerformed( EFalse );
+ // read parameters
+ if ( aItem.GetNextInt( firstTimeStartPerformed ) )
+ {
+ err = KErrBadTestParameter;
+ ERROR( err, "Missing Parameter: firstTimeStartPerformed." );
+ }
+
+ iSettings->ApplicationSettings().SetFirstTimeStartPerformed( firstTimeStartPerformed );
+ return err;
+}
+
+
+
+// -----------------------------------------------------------------------------
+// CSettingsTestModule::SetUiFlags()
+// Returns: Errors.
+// -----------------------------------------------------------------------------
+TInt CSettingsTestModule::SetUiFlags( CStifItemParser& aItem )
+{
+ FUNC_LOG;
+ TUint uiFlags( 0 );
+ TInt err( KErrNone );
+
+ // read parameters
+ if ( aItem.GetNextInt(uiFlags) )
+ {
+ err = KErrBadTestParameter;
+ ERROR( err, "Missing Parameter: uiFlags." );
+ }
+ err = iSettings->ApplicationSettings().SetUiFlags( uiFlags );
+ return err;
+}
+
+
+// -----------------------------------------------------------------------------
+// CSettingsTestModule::UiFlags()
+// Returns: Errors.
+// -----------------------------------------------------------------------------
+TInt CSettingsTestModule::UiFlags( CStifItemParser& aItem )
+{
+ FUNC_LOG;
+ TUint expectedUiFlags( 0 );
+ TUint currentUiFlags( 0 );
+ TInt err( KErrNone );
+
+ // read parameters
+ if ( aItem.GetNextInt(expectedUiFlags) )
+ {
+ err = KErrBadTestParameter;
+ ERROR( err, "Missing Parameter: expectedUiFlags." );
+ }
+ currentUiFlags = iSettings->ApplicationSettings().UiFlags();
+ if ( expectedUiFlags != currentUiFlags )
+ {
+ INFO_2( "Failed: currentUiFlags=%i, expectedUiFlags=%i.", currentUiFlags, expectedUiFlags );
+ err = KErrUnexpectedValue;
+ }
+ return err;
+}
+
+
+// -----------------------------------------------------------------------------
+// CSettingsTestModule::HeadsetVolume()
+// Returns: Errors.
+// -----------------------------------------------------------------------------
+TInt CSettingsTestModule::HeadsetVolume( CStifItemParser& aItem )
+{
+ FUNC_LOG;
+ TUint expectedVolume( 0 );
+ TUint currentVolume( 0 );
+ TInt err( KErrNone );
+
+ // read parameters
+ if ( aItem.GetNextInt(expectedVolume) )
+ {
+ err = KErrBadTestParameter;
+ ERROR( err, "Missing Parameter: expectedVolume." );
+ }
+ currentVolume = iSettings->EngineSettings().HeadsetVolume();
+ if ( expectedVolume != currentVolume )
+ {
+ INFO_2( "Failed: currentVolume=%i, expectedVolume=%i.", currentVolume, expectedVolume );
+ err = KErrUnexpectedValue;
+ }
+ return err;
+}
+
+
+// -----------------------------------------------------------------------------
+// CSettingsTestModule::SetHeadsetVolume()
+// Returns: Errors.
+// -----------------------------------------------------------------------------
+TInt CSettingsTestModule::SetHeadsetVolume( CStifItemParser& aItem )
+{
+ FUNC_LOG;
+ TUint volume( 0 );
+ TInt err( KErrNone );
+ // read parameters
+ if ( aItem.GetNextInt(volume) )
+ {
+ err = KErrBadTestParameter;
+ ERROR( err, "Missing Parameter: volume." );
+ }
+ err = iSettings->RadioSetter().SetHeadsetVolume( volume );
+ return err;
+}
+
+// -----------------------------------------------------------------------------
+// CSettingsTestModule::SpeakerVolume()
+// Returns: Errors.
+// -----------------------------------------------------------------------------
+TInt CSettingsTestModule::SpeakerVolume( CStifItemParser& aItem )
+{
+ FUNC_LOG;
+ TUint expectedVolume( 0 );
+ TUint currentVolume( 0 );
+ TInt err( KErrNone );
+
+ // read parameters
+ if ( aItem.GetNextInt(expectedVolume) )
+ {
+ err = KErrBadTestParameter;
+ ERROR( err, "Missing Parameter: expectedVolume." );
+ }
+ currentVolume = iSettings->EngineSettings().SpeakerVolume();
+ if ( expectedVolume != currentVolume )
+ {
+ INFO_2( "Failed: currentVolume=%i, expectedVolume=%i.", currentVolume, expectedVolume );
+ err = KErrUnexpectedValue;
+ }
+ return err;
+}
+
+
+// -----------------------------------------------------------------------------
+// CSettingsTestModule::SetSpeakerVolume()
+// Returns: Errors.
+// -----------------------------------------------------------------------------
+TInt CSettingsTestModule::SetSpeakerVolume( CStifItemParser& aItem )
+{
+ FUNC_LOG;
+ TUint volume( 0 );
+ TInt err( KErrNone );
+
+ // read parameters
+ if ( aItem.GetNextInt(volume) )
+ {
+ err = KErrBadTestParameter;
+ ERROR( err, "Missing Parameter: volume." );
+ }
+ err = iSettings->RadioSetter().SetSpeakerVolume( volume );
+ return err;
+}
+
+
+// -----------------------------------------------------------------------------
+// CSettingsTestModule::Volume()
+// Returns: Errors.
+// -----------------------------------------------------------------------------
+TInt CSettingsTestModule::Volume( CStifItemParser& aItem )
+{
+ FUNC_LOG;
+ TUint expectedVolume( 0 );
+ TUint currentVolume( 0 );
+ TInt err( KErrNone );
+
+ // read parameters
+ if ( aItem.GetNextInt(expectedVolume) )
+ {
+ err = KErrBadTestParameter;
+ ERROR( err, "Missing Parameter: expectedVolume." );
+ }
+ currentVolume = iSettings->EngineSettings().Volume();
+ if ( expectedVolume != currentVolume )
+ {
+ INFO_2( "Failed: currentVolume=%i, expectedVolume=%i.", currentVolume, expectedVolume );
+ err = KErrUnexpectedValue;
+ }
+ return err;
+}
+
+
+// -----------------------------------------------------------------------------
+// CSettingsTestModule::SetVolume()
+// Returns: Errors.
+// -----------------------------------------------------------------------------
+TInt CSettingsTestModule::SetVolume( CStifItemParser& aItem )
+{
+ FUNC_LOG;
+ TUint volume( 0 );
+ TInt err( KErrNone );
+
+ // read parameters
+ if ( aItem.GetNextInt(volume) )
+ {
+ err = KErrBadTestParameter;
+ ERROR( err, "Missing Parameter: volume." );
+ }
+ err = iSettings->RadioSetter().SetVolume( volume );
+ return err;
+}
+
+
+
+// -----------------------------------------------------------------------------
+// CSettingsTestModule::OutputMode()
+// Returns: Errors.
+// -----------------------------------------------------------------------------
+TInt CSettingsTestModule::OutputMode( CStifItemParser& aItem )
+{
+ FUNC_LOG;
+ TUint expectedMode( 0 );
+ TUint currentMode( 0 );
+ TInt err( KErrNone );
+
+ // read parameters
+ if ( aItem.GetNextInt(expectedMode) )
+ {
+ err = KErrBadTestParameter;
+ ERROR( err, "Missing Parameter: expectedMode." );
+ }
+ currentMode = iSettings->EngineSettings().OutputMode();
+ if ( expectedMode != currentMode )
+ {
+ INFO_2( "Failed: currentMode=%i, expectedMode=%i.", currentMode, expectedMode );
+ err = KErrUnexpectedValue;
+ }
+ return err;
+}
+
+
+// -----------------------------------------------------------------------------
+// CSettingsTestModule::SetOutputMode()
+// Returns: Errors.
+// -----------------------------------------------------------------------------
+TInt CSettingsTestModule::SetOutputMode( CStifItemParser& aItem )
+{
+ FUNC_LOG;
+ TUint mode( 0 );
+ TInt err( KErrNone );
+
+ // read parameters
+ if ( aItem.GetNextInt(mode) )
+ {
+ err = KErrBadTestParameter;
+ ERROR( err, "Missing Parameter: mode." );
+ }
+ err = iSettings->RadioSetter().SetOutputMode( mode );
+ return err;
+}
+
+
+// -----------------------------------------------------------------------------
+// CSettingsTestModule::AudioRoute()
+// Returns: Errors.
+// -----------------------------------------------------------------------------
+TInt CSettingsTestModule::AudioRoute( CStifItemParser& aItem )
+{
+ FUNC_LOG;
+ TUint expectedRoute( 0 );
+ TUint currentRoute( 0 );
+ TInt err( KErrNone );
+
+ // read parameters
+ if ( aItem.GetNextInt(expectedRoute) )
+ {
+ err = KErrBadTestParameter;
+ ERROR( err, "Missing Parameter: expectedRoute." );
+ }
+ currentRoute = iSettings->EngineSettings().AudioRoute();
+ if ( expectedRoute != currentRoute )
+ {
+ INFO_2( "Failed: currentMode=%i, expectedRoute=%i.", currentRoute, expectedRoute );
+ err = KErrUnexpectedValue;
+ }
+ return err;
+}
+
+// -----------------------------------------------------------------------------
+// CSettingsTestModule::SetAudioRoute()
+// Returns: Errors.
+// -----------------------------------------------------------------------------
+TInt CSettingsTestModule::SetAudioRoute( CStifItemParser& aItem )
+{
+ FUNC_LOG;
+ TUint route( 0 );
+ TInt err( KErrNone );
+
+ // read parameters
+ if ( aItem.GetNextInt(route) )
+ {
+ err = KErrBadTestParameter;
+ ERROR( err, "Missing Parameter: route." );
+ }
+ err = iSettings->RadioSetter().SetAudioRoute( route );
+ return err;
+}
+
+// -----------------------------------------------------------------------------
+// CSettingsTestModule::IsHeadsetVolMuted()
+// Returns: Errors.
+// -----------------------------------------------------------------------------
+TInt CSettingsTestModule::IsHeadsetVolMuted( CStifItemParser& aItem )
+{
+ FUNC_LOG;
+ TInt err( KErrNone );
+ TUint expectedMuteStatus( 0 );
+ TUint currentMuteStatus( 0 );
+
+ // read parameters
+ if ( aItem.GetNextInt(expectedMuteStatus) )
+ {
+ err = KErrBadTestParameter;
+ ERROR( err, "Missing Parameter: expectedMuteStatus." );
+ }
+ currentMuteStatus = iSettings->EngineSettings().IsHeadsetVolMuted();
+ if ( currentMuteStatus != expectedMuteStatus )
+ {
+ INFO_2( "Failed: currentMuteStatus=%i, expectedMuteStatus=%i.", currentMuteStatus, expectedMuteStatus );
+ err = KErrUnexpectedValue;
+ }
+ return err;
+}
+
+
+// -----------------------------------------------------------------------------
+// CSettingsTestModule::SetHeadsetVolMuted()
+// Returns: Errors.
+// -----------------------------------------------------------------------------
+TInt CSettingsTestModule::SetHeadsetVolMuted( CStifItemParser& aItem )
+{
+ FUNC_LOG;
+ TUint muteStatus( 0 );
+ TInt err( KErrNone );
+
+ // read parameters
+ if ( aItem.GetNextInt(muteStatus) )
+ {
+ err = KErrBadTestParameter;
+ ERROR( err, "Missing Parameter: muteStatus." );
+ }
+ err = iSettings->RadioSetter().SetHeadsetVolMuted( muteStatus );
+ return err;
+}
+
+
+// -----------------------------------------------------------------------------
+// CSettingsTestModule::IsSpeakerVolMuted()
+// Returns: Errors.
+// -----------------------------------------------------------------------------
+TInt CSettingsTestModule::IsSpeakerVolMuted( CStifItemParser& aItem )
+{
+ FUNC_LOG;
+ TInt err( KErrNone );
+ TUint expectedMuteStatus( 0 );
+ TUint currentMuteStatus( 0 );
+
+ // read parameters
+ if ( aItem.GetNextInt(expectedMuteStatus) )
+ {
+ err = KErrBadTestParameter;
+ ERROR( err, "Missing Parameter: expectedMuteStatus." );
+ }
+ currentMuteStatus = iSettings->EngineSettings().IsSpeakerVolMuted();
+ if ( currentMuteStatus != expectedMuteStatus )
+ {
+ INFO_2( "Failed: currentMuteStatus=%i, expectedMuteStatus=%i.", currentMuteStatus, expectedMuteStatus );
+ err = KErrUnexpectedValue;
+ }
+ return err;
+}
+
+
+// -----------------------------------------------------------------------------
+// CSettingsTestModule::SetSpeakerVolMuted()
+// Returns: Errors.
+// -----------------------------------------------------------------------------
+TInt CSettingsTestModule::SetSpeakerVolMuted( CStifItemParser& aItem )
+{
+ FUNC_LOG;
+ TUint muteStatus( 0 );
+ TInt err( KErrNone );
+
+ // read parameters
+ if ( aItem.GetNextInt(muteStatus) )
+ {
+ err = KErrBadTestParameter;
+ ERROR( err, "Missing Parameter: muteStatus." );
+ }
+ err = iSettings->RadioSetter().SetSpeakerVolMuted( muteStatus );
+ return err;
+}
+
+
+// -----------------------------------------------------------------------------
+// CSettingsTestModule::IsVolMuted()
+// Returns: Errors.
+// -----------------------------------------------------------------------------
+TInt CSettingsTestModule::IsVolMuted( CStifItemParser& aItem )
+{
+ FUNC_LOG;
+ TInt err( KErrNone );
+ TUint expectedMuteStatus( 0 );
+ TUint currentMuteStatus( 0 );
+
+ // read parameters
+ if ( aItem.GetNextInt(expectedMuteStatus) )
+ {
+ err = KErrBadTestParameter;
+ ERROR( err, "Missing Parameter: expectedMuteStatus." );
+ }
+ currentMuteStatus = iSettings->EngineSettings().IsVolMuted();
+ if ( currentMuteStatus != expectedMuteStatus )
+ {
+ INFO_2( "Failed: currentMuteStatus=%i, expectedMuteStatus=%i.", currentMuteStatus, expectedMuteStatus );
+ err = KErrUnexpectedValue;
+ }
+ return err;
+}
+
+// -----------------------------------------------------------------------------
+// CSettingsTestModule::SetVolMuted()
+// Returns: Errors.
+// -----------------------------------------------------------------------------
+TInt CSettingsTestModule::SetVolMuted( CStifItemParser& aItem )
+{
+ FUNC_LOG;
+ TUint muteStatus( 0 );
+ TInt err( KErrNone );
+
+ // read parameters
+ if ( aItem.GetNextInt(muteStatus) )
+ {
+ err = KErrBadTestParameter;
+ ERROR( err, "Missing Parameter: muteStatus." );
+ }
+ err = iSettings->RadioSetter().SetVolMuted( muteStatus );
+ return err;
+}
+
+
+// -----------------------------------------------------------------------------
+// CSettingsTestModule::IsPowerOn()
+// Returns: Errors.
+// -----------------------------------------------------------------------------
+TInt CSettingsTestModule::IsPowerOn( CStifItemParser& aItem )
+{
+ FUNC_LOG;
+ TInt err( KErrNone );
+ TUint expectedPowerStatus( 0 );
+ TUint currentPowerStatus( 0 );
+
+ // read parameters
+ if ( aItem.GetNextInt(expectedPowerStatus) )
+ {
+ err = KErrBadTestParameter;
+ ERROR( err, "Missing Parameter: expectedPowerStatus." );
+ }
+ currentPowerStatus = iSettings->EngineSettings().IsPowerOn();
+ if ( currentPowerStatus != expectedPowerStatus )
+ {
+ INFO_2( "Failed: currentPowerStatus=%i, expectedPowerStatus=%i.", currentPowerStatus, expectedPowerStatus );
+ err = KErrUnexpectedValue;
+ }
+ return err;
+}
+
+
+// -----------------------------------------------------------------------------
+// CSettingsTestModule::SetPowerOn()
+// Returns: Errors.
+// -----------------------------------------------------------------------------
+TInt CSettingsTestModule::SetPowerOn( CStifItemParser& aItem )
+{
+ FUNC_LOG;
+ TUint powerStatus( 0 );
+ TInt err( KErrNone );
+
+ // read parameters
+ if ( aItem.GetNextInt(powerStatus) )
+ {
+ err = KErrBadTestParameter;
+ ERROR( err, "Missing Parameter: powerStatus." );
+ }
+ err = iSettings->RadioSetter().SetPowerOn( powerStatus );
+ return err;
+}
+
+
+// -----------------------------------------------------------------------------
+// CSettingsTestModule::TunedFrequency()
+// Returns: Errors.
+// -----------------------------------------------------------------------------
+TInt CSettingsTestModule::TunedFrequency( CStifItemParser& aItem )
+{
+ FUNC_LOG;
+ TInt err( KErrNone );
+ TUint expectedTunedFrequency( 0 );
+ TUint currentTunedFrequency( 0 );
+
+ // read parameters
+ if ( aItem.GetNextInt(expectedTunedFrequency) )
+ {
+ err = KErrBadTestParameter;
+ ERROR( err, "Missing Parameter: expectedTunedFrequency." );
+ }
+ currentTunedFrequency = iSettings->EngineSettings().TunedFrequency();
+ if ( currentTunedFrequency != expectedTunedFrequency )
+ {
+ INFO_2( "Failed: currentTunedFrequency=%i, expectedTunedFrequency=%i.", currentTunedFrequency, expectedTunedFrequency );
+ err = KErrUnexpectedValue;
+ }
+ return err;
+}
+
+// -----------------------------------------------------------------------------
+// CSettingsTestModule::SetTunedFrequency()
+// Returns: Errors.
+// -----------------------------------------------------------------------------
+TInt CSettingsTestModule::SetTunedFrequency( CStifItemParser& aItem )
+{
+ FUNC_LOG;
+ TUint tunedFrequency( 0 );
+ TInt err( KErrNone );
+
+ // read parameters
+ if ( aItem.GetNextInt( tunedFrequency ) )
+ {
+ err = KErrBadTestParameter;
+ ERROR( err, "Missing Parameter: tunedFrequency." );
+ }
+ err = iSettings->RadioSetter().SetTunedFrequency( tunedFrequency );
+ return err;
+}
+
+
+// -----------------------------------------------------------------------------
+// CSettingsTestModule::DefaultMinVolumeLevel()
+// Returns: Errors.
+// -----------------------------------------------------------------------------
+TInt CSettingsTestModule::DefaultMinVolumeLevel( CStifItemParser& /*aItem*/ )
+{
+ FUNC_LOG;
+ TInt err( KErrNone );
+ TUint currentDefaultMinVolumeLevel( iSettings->EngineSettings().DefaultMinVolumeLevel() );
+ INFO_1( "OK currentDefaultMinVolumeLevel=%i", currentDefaultMinVolumeLevel );
+ return err;
+}
+
+
+// -----------------------------------------------------------------------------
+// CSettingsTestModule::CountRegions()
+// Returns: Errors.
+// -----------------------------------------------------------------------------
+TInt CSettingsTestModule::CountRegions( CStifItemParser& /*aItem*/ )
+{
+ FUNC_LOG;
+ TInt err( KErrNone );
+ TUint currentRegionCount( iSettings->EngineSettings().CountRegions() );
+ INFO_1( "OK currentRegionCount=%i", currentRegionCount );
+ return err;
+}
+
+
+// -----------------------------------------------------------------------------
+// CSettingsTestModule::Region()
+// Returns: Errors.
+// -----------------------------------------------------------------------------
+TInt CSettingsTestModule::Region( CStifItemParser& /*aItem*/ )
+{
+ FUNC_LOG;
+ TInt err( KErrNone );
+ TInt regionIndex( iSettings->EngineSettings().RegionId() );
+ //CRadioRegion& radioRegion( iSettings->EngineSettings().RegionIndexForId( regionIndex ) );
+ // 17.5.2010: Region handling has to be reimplemented anyways, so don't make any detailed tets
+ // Above won't work because called function RegionIndexForId() is private one.
+
+ return err;
+}
+
+
+
+// -----------------------------------------------------------------------------
+// CSettingsTestModule::RegionId()
+// Returns: Errors.
+// -----------------------------------------------------------------------------
+TInt CSettingsTestModule::RegionId( CStifItemParser& aItem )
+{
+ FUNC_LOG;
+ TInt expectedRegionIndex( 0 );
+ TInt currentRegionIndex( 0 );
+ TInt err( KErrNone );
+
+ // read parameters
+ if ( aItem.GetNextInt( expectedRegionIndex ) )
+ {
+ err = KErrBadTestParameter;
+ ERROR( err, "Missing Parameter: expectedRegionIndex." );
+ }
+ currentRegionIndex = iSettings->EngineSettings().RegionId();
+ if ( currentRegionIndex != expectedRegionIndex )
+ {
+ INFO_2( "Failed: currentRegionIndex=%i, expectedRegionIndex=%i.", currentRegionIndex, expectedRegionIndex );
+ err = KErrUnexpectedValue;
+ }
+ return err;
+}
+
+
+// -----------------------------------------------------------------------------
+// CSettingsTestModule::SetRegionId()
+// Returns: Errors.
+// -----------------------------------------------------------------------------
+TInt CSettingsTestModule::SetRegionId( CStifItemParser& aItem )
+{
+ FUNC_LOG;
+ TInt regionId( 0 );
+ TInt err( KErrNone );
+
+ // read parameters
+ if ( aItem.GetNextInt( regionId ) )
+ {
+ err = KErrBadTestParameter;
+ ERROR( err, "Missing Parameter: regionId." );
+ }
+ err = iSettings->RadioSetter().SetRegionId( regionId );
+ return err;
+}
+
+
+// -----------------------------------------------------------------------------
+// CSettingsTestModule::FrequencyStepSize()
+// Returns: Errors.
+// -----------------------------------------------------------------------------
+TInt CSettingsTestModule::FrequencyStepSize( CStifItemParser& /*aItem*/ )
+{
+ FUNC_LOG;
+ TInt err( KErrNone );
+ TUint32 currentFrequencyStepSize( iSettings->EngineSettings().FrequencyStepSize() );
+ INFO_1( "OK currentFrequencyStepSize=%i", currentFrequencyStepSize );
+ return err;
+}
+
+
+// -----------------------------------------------------------------------------
+// CSettingsTestModule::MaxFrequency()
+// Returns: Errors.
+// -----------------------------------------------------------------------------
+TInt CSettingsTestModule::MaxFrequency( CStifItemParser& /*aItem*/ )
+{
+ FUNC_LOG;
+ TInt err( KErrNone );
+ TUint32 currentMaxFrequency( iSettings->EngineSettings().MaxFrequency() );
+ INFO_1( "OK currentMaxFrequency=%i", currentMaxFrequency );
+ return err;
+}
+
+
+// -----------------------------------------------------------------------------
+// CSettingsTestModule::MinFrequency()
+// Returns: Errors.
+// -----------------------------------------------------------------------------
+TInt CSettingsTestModule::MinFrequency( CStifItemParser& /*aItem*/ )
+{
+ FUNC_LOG;
+ TInt err( KErrNone );
+ TUint32 currentMinFrequency( iSettings->EngineSettings().MinFrequency() );
+ INFO_1( "OK currentMinFrequency=%i", currentMinFrequency );
+ return err;
+}
+
+
+// -----------------------------------------------------------------------------
+// CSettingsTestModule::DecimalCount()
+// Returns: Errors.
+// -----------------------------------------------------------------------------
+TInt CSettingsTestModule::DecimalCount( CStifItemParser& /*aItem*/ )
+{
+ FUNC_LOG;
+ TInt err( KErrNone );
+ TInt currentDecimalCount( iSettings->EngineSettings().DecimalCount() );
+ INFO_1( "OK currentDecimalCount=%i", currentDecimalCount );
+ return err;
+}
+
+
+// -----------------------------------------------------------------------------
+// CSettingsTestModule::DefaultRegion()
+// Returns: Errors.
+// -----------------------------------------------------------------------------
+TInt CSettingsTestModule::DefaultRegion( CStifItemParser& /*aItem*/ )
+{
+ FUNC_LOG;
+ TInt err( KErrNone );
+ TRadioRegion defaultRegion( iSettings->EngineSettings().DefaultRegion() );
+ INFO_1( "OK defaultRegion=%i", defaultRegion );
+ return err;
+}
+
+
+// -----------------------------------------------------------------------------
+// CSettingsTestModule::NetworkId()
+// Returns: Errors.
+// -----------------------------------------------------------------------------
+TInt CSettingsTestModule::NetworkId( CStifItemParser& aItem )
+{
+ FUNC_LOG;
+ TInt err( KErrNone );
+ TPtrC expectedNetworkId;
+ if ( aItem.GetNextString(expectedNetworkId) )
+ {
+ err = KErrBadTestParameter;
+ ERROR( err, "Missing Parameter: expectedNetworkId." );
+ }
+ INFO_1( "expectedNetworkId=%S.", &expectedNetworkId );
+ TPtrC actualNetworkId( iSettings->EngineSettings().NetworkId() );
+ if ( !actualNetworkId.Compare( expectedNetworkId ) )
+ {
+ INFO_2( "Failed: actualNetworkId=%S, expectedNetworkId=%S.", &actualNetworkId, &expectedNetworkId );
+ err = KErrUnexpectedValue;
+ }
+ return err;
+}
+
+
+// -----------------------------------------------------------------------------
+// CSettingsTestModule::CountryCode()
+// Returns: Errors.
+// -----------------------------------------------------------------------------
+TInt CSettingsTestModule::CountryCode( CStifItemParser& aItem )
+{
+ FUNC_LOG;
+ TInt err( KErrNone );
+ TPtrC expectedCountryCode;
+ if ( aItem.GetNextString(expectedCountryCode) )
+ {
+ err = KErrBadTestParameter;
+ ERROR( err, "Missing Parameter: expectedCountryCode." );
+ }
+ INFO_1( "expectedCountryCode=%S.", &expectedCountryCode );
+ TPtrC actualCountryCode( iSettings->EngineSettings().CountryCode() );
+ if ( !actualCountryCode.Compare( expectedCountryCode ) )
+ {
+ INFO_2( "Failed: actualCountryCode=%S, expectedCountryCode=%S.", &actualCountryCode, &expectedCountryCode );
+ err = KErrUnexpectedValue;
+ }
+ return err;
+}
+
+
+// -----------------------------------------------------------------------------
+// CSettingsTestModule::SetNetworkId()
+// Returns: Errors.
+// -----------------------------------------------------------------------------
+TInt CSettingsTestModule::SetNetworkId( CStifItemParser& aItem )
+{
+ FUNC_LOG;
+ TInt err( KErrNone );
+ TPtrC networkId;
+ aItem.SetParsingType( CStifItemParser::EQuoteStyleParsing );
+ if ( aItem.GetNextString(networkId) )
+ {
+ err = KErrBadTestParameter;
+ ERROR( err, "Missing Parameter: networkId." );
+ }
+ err = iSettings->RadioSetter().SetNetworkId( networkId );
+ return err;
+}
+
+
+// -----------------------------------------------------------------------------
+// CSettingsTestModule::SetCountryCode()
+// Returns: Errors.
+// -----------------------------------------------------------------------------
+TInt CSettingsTestModule::SetCountryCode( CStifItemParser& aItem )
+{
+ FUNC_LOG;
+ TInt err( KErrNone );
+ TPtrC countryCode;
+ aItem.SetParsingType( CStifItemParser::EQuoteStyleParsing );
+ if ( aItem.GetNextString(countryCode) )
+ {
+ err = KErrBadTestParameter;
+ ERROR( err, "Missing Parameter: countryCode." );
+ }
+ err = iSettings->RadioSetter().SetCountryCode( countryCode );
+ return err;
+}
+
+
+// -----------------------------------------------------------------------------
+// CSettingsTestModule::ReadConfigurableKeysL()
+// Returns: Errors.
+// -----------------------------------------------------------------------------
+TInt CSettingsTestModule::ReadConfigurableKeysL( CStifItemParser& /*aItem*/ )
+{
+ FUNC_LOG;
+ TInt err( KErrNone );
+ TInt regionAllowed( EFalse );
+ CRepository* cr( CRepository::NewL(KRadioCRUid) );
+ if ( cr )
+ {
+ cr->Get( KRadioCRRegionAllowedJapan, regionAllowed );
+ delete cr;
+ }
+ INFO_1( "KRadioCRRegionAllowedJapan status = %i", regionAllowed );
+ return err;
+}
+
+// -----------------------------------------------------------------------------
+// CSettingsTestModule::RdsAfSearchSettingChangedL()
+// Returns: None.
+// -----------------------------------------------------------------------------
+void CSettingsTestModule::RdsAfSearchSettingChangedL( TBool /*aEnabled*/ )
+{
+ FUNC_LOG;
+}
+
+// -----------------------------------------------------------------------------
+// CSettingsTestModule::RegionSettingChangedL()
+// Returns: None.
+// -----------------------------------------------------------------------------
+void CSettingsTestModule::RegionSettingChangedL( TInt /*aRegion*/ )
+{
+ FUNC_LOG;
+ iRegionSettingChangeNotified = ETrue;
+}
+
+// -----------------------------------------------------------------------------
+// CSettingsTestModule::tstSetRegionIdL()
+// Returns: errors.
+// -----------------------------------------------------------------------------
+TInt CSettingsTestModule::tstSetRegionIdL( CStifItemParser& aItem )
+{
+ FUNC_LOG;
+ TInt regionId( 0 );
+ TInt err( KErrNone );
+
+ // read parameters
+ if ( aItem.GetNextInt( regionId ) )
+ {
+ err = KErrBadTestParameter;
+ ERROR( err, "Missing Parameter: regionId." );
+ }
+ CRepository* cr( CRepository::NewLC(KRadioCRUid) );
+ User::LeaveIfError( cr->Set( KRadioCRCurrentRegion, regionId ) );
+ CleanupStack::Pop(cr);
+ delete cr;
+ return err;
+}
+
+// -----------------------------------------------------------------------------
+// CSettingsTestModule::tstResetStartCount()
+// Returns: errors.
+// -----------------------------------------------------------------------------
+TInt CSettingsTestModule::tstResetStartCount( CStifItemParser& /*aItem*/ )
+{
+ FUNC_LOG;
+ TInt countResetValue( 0 );
+ TInt err( KErrNone );
+
+ CRepository* cr( CRepository::NewLC(KRadioCRUid) );
+ User::LeaveIfError( cr->Set( KRadioCRLaunchCount, countResetValue ) );
+ CleanupStack::Pop(cr);
+ delete cr;
+ return err;
+}
+
+// -----------------------------------------------------------------------------
+// CSettingsTestModuleModule::?member_function
+// ?implementation_description
+// (other items were commented in a header).
+// -----------------------------------------------------------------------------
+//
+/*
+TInt CSettingsTestModule::?member_function(
+ CItemParser& aItem )
+ {
+ FUNC_LOG;
+
+ ?code
+
+ }
+*/
+
+// ========================== OTHER EXPORTED FUNCTIONS =========================
+// None
+
+// [End of File] - Do not remove
--- a/radioengine/utils/group/radioengineutils.mmp Fri Jun 11 13:38:32 2010 +0300
+++ b/radioengine/utils/group/radioengineutils.mmp Fri Jun 25 19:09:05 2010 +0300
@@ -29,6 +29,7 @@
CAPABILITY CAP_GENERAL_DLL
VENDORID VID_DEFAULT
PAGED
+SMPSAFE
USERINCLUDE ../api
USERINCLUDE ../inc
--- a/radioengine/utils/src/cradioaccessoryobserver.cpp Fri Jun 11 13:38:32 2010 +0300
+++ b/radioengine/utils/src/cradioaccessoryobserver.cpp Fri Jun 25 19:09:05 2010 +0300
@@ -24,7 +24,7 @@
#include "cradioenginelogger.h"
#ifdef ASW_CORE_AUDIO_PLATFORM_VERSION // Nokia specific adaptation
-#include <internal/accpolpropgenericid.h>
+#include <accpolpropgenericid.h>
const TUint KPhysicalConnectionBitmask = KPCNokiaAV | KPCWired;
#else
const TUint KPhysicalConnectionBitmask = KPCWired;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioengine/utils/stub/bwins/fmradioengineutils_stubu.def Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,32 @@
+EXPORTS
+ ?ValueDes8@CRadioPropertyObserver@@QBEABVTDesC8@@XZ @ 1 NONAME ; class TDesC8 const & CRadioPropertyObserver::ValueDes8(void) const
+ ?SetAudioRouteL@CRadioRoutableAudio@@QAEXW4TRadioAudioRoute@RadioEngine@@@Z @ 2 NONAME ; void CRadioRoutableAudio::SetAudioRouteL(enum RadioEngine::TRadioAudioRoute)
+ ??0CRadioRoutableAudio@@QAE@PAVCRadioAudioRouter@@@Z @ 3 NONAME ; CRadioRoutableAudio::CRadioRoutableAudio(class CRadioAudioRouter *)
+ ?InitializeL@RadioEngineUtils@@SAXXZ @ 4 NONAME ; void RadioEngineUtils::InitializeL(void)
+ ?NewL@CRadioRemConTarget@@SAPAV1@XZ @ 5 NONAME ; class CRadioRemConTarget * CRadioRemConTarget::NewL(void)
+ ??1CRadioRepositoryEntityBase@@UAE@XZ @ 6 NONAME ; CRadioRepositoryEntityBase::~CRadioRepositoryEntityBase(void)
+ ??1TRadioMethodLogger@@QAE@XZ @ 7 NONAME ; TRadioMethodLogger::~TRadioMethodLogger(void)
+ ??1CRadioRoutableAudio@@UAE@XZ @ 8 NONAME ; CRadioRoutableAudio::~CRadioRoutableAudio(void)
+ ?SetAudioOutput@CRadioRoutableAudio@@IAEXPAVCAudioOutput@@@Z @ 9 NONAME ; void CRadioRoutableAudio::SetAudioOutput(class CAudioOutput *)
+ ?RegisterRoutableAudio@CRadioAudioRouter@@QAEXPAVCRadioRoutableAudio@@@Z @ 10 NONAME ; void CRadioAudioRouter::RegisterRoutableAudio(class CRadioRoutableAudio *)
+ ?ReadFrequencyStringLC@RadioEngineUtils@@SAPAVHBufC16@@KHH@Z @ 11 NONAME ; class HBufC16 * RadioEngineUtils::ReadFrequencyStringLC(unsigned long, int, int)
+ ?ValueDes@CRadioPropertyObserver@@QBEABVTDesC16@@XZ @ 12 NONAME ; class TDesC16 const & CRadioPropertyObserver::ValueDes(void) const
+ ??0CRadioRepositoryEntityBase@@IAE@ABVTUid@@KAAVMRadioRepositoryEntityObserver@@W4TPriority@CActive@@@Z @ 13 NONAME ; CRadioRepositoryEntityBase::CRadioRepositoryEntityBase(class TUid const &, unsigned long, class MRadioRepositoryEntityObserver &, enum CActive::TPriority)
+ ??1CRadioSystemEventCollector@@UAE@XZ @ 14 NONAME ; CRadioSystemEventCollector::~CRadioSystemEventCollector(void)
+ ??1CRadioAudioRouter@@UAE@XZ @ 15 NONAME ; CRadioAudioRouter::~CRadioAudioRouter(void)
+ ?ActivateL@CRadioPropertyObserver@@QAEXXZ @ 16 NONAME ; void CRadioPropertyObserver::ActivateL(void)
+ ?Logger@RadioEngineUtils@@SAPAVMRadioEngineLogger@@XZ @ 17 NONAME ; class MRadioEngineLogger * RadioEngineUtils::Logger(void)
+ ?NewL@CRadioSystemEventCollector@@SAPAV1@XZ @ 18 NONAME ; class CRadioSystemEventCollector * CRadioSystemEventCollector::NewL(void)
+ ?Logger@MRadioEngineLogger@@SAPAV1@XZ @ 19 NONAME ; class MRadioEngineLogger * MRadioEngineLogger::Logger(void)
+ ?Release@RadioEngineUtils@@SAXXZ @ 20 NONAME ; void RadioEngineUtils::Release(void)
+ ?DeleteAudioOutput@CRadioRoutableAudio@@IAEXXZ @ 21 NONAME ; void CRadioRoutableAudio::DeleteAudioOutput(void)
+ ?FormatFrequencyString@RadioEngineUtils@@SAXAAVTDes16@@KHAAVTDesC16@@@Z @ 22 NONAME ; void RadioEngineUtils::FormatFrequencyString(class TDes16 &, unsigned long, int, class TDesC16 &)
+ ?ValueInt@CRadioPropertyObserver@@QBEHXZ @ 23 NONAME ; int CRadioPropertyObserver::ValueInt(void) const
+ ?SetAudioRouteL@CRadioAudioRouter@@QAEXW4TRadioAudioRoute@RadioEngine@@@Z @ 24 NONAME ; void CRadioAudioRouter::SetAudioRouteL(enum RadioEngine::TRadioAudioRoute)
+ ?NewL@CRadioAudioRouter@@SAPAV1@AAVMRadioAudioRoutingObserver@@@Z @ 25 NONAME ; class CRadioAudioRouter * CRadioAudioRouter::NewL(class MRadioAudioRoutingObserver &)
+ ?FsSession@RadioEngineUtils@@SAAAVRFs@@XZ @ 26 NONAME ; class RFs & RadioEngineUtils::FsSession(void)
+ ?UnRegisterRoutableAudio@CRadioAudioRouter@@QAEXPAVCRadioRoutableAudio@@@Z @ 27 NONAME ; void CRadioAudioRouter::UnRegisterRoutableAudio(class CRadioRoutableAudio *)
+ ?AudioRoutingSupported@CRadioRoutableAudio@@QBEHXZ @ 28 NONAME ; int CRadioRoutableAudio::AudioRoutingSupported(void) const
+ ?NewL@CRadioPropertyObserver@@SAPAV1@AAVMRadioPropertyChangeObserver@@ABVTUid@@IW4TRadioPropertyType@1@@Z @ 29 NONAME ; class CRadioPropertyObserver * CRadioPropertyObserver::NewL(class MRadioPropertyChangeObserver &, class TUid const &, unsigned int, enum CRadioPropertyObserver::TRadioPropertyType)
+ ??0TRadioMethodLogger@@QAE@PBG0@Z @ 30 NONAME ; TRadioMethodLogger::TRadioMethodLogger(unsigned short const *, unsigned short const *)
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioengine/utils/stub/eabi/fmradioengineutils_stubu.def Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,49 @@
+EXPORTS
+ _ZN16RadioEngineUtils11InitializeLEv @ 1 NONAME
+ _ZN16RadioEngineUtils21FormatFrequencyStringER6TDes16miR7TDesC16 @ 2 NONAME
+ _ZN16RadioEngineUtils21ReadFrequencyStringLCEmii @ 3 NONAME
+ _ZN16RadioEngineUtils6LoggerEv @ 4 NONAME
+ _ZN16RadioEngineUtils7ReleaseEv @ 5 NONAME
+ _ZN16RadioEngineUtils9FsSessionEv @ 6 NONAME
+ _ZN17CRadioAudioRouter14SetAudioRouteLEN11RadioEngine16TRadioAudioRouteE @ 7 NONAME
+ _ZN17CRadioAudioRouter21RegisterRoutableAudioEP19CRadioRoutableAudio @ 8 NONAME
+ _ZN17CRadioAudioRouter23UnRegisterRoutableAudioEP19CRadioRoutableAudio @ 9 NONAME
+ _ZN17CRadioAudioRouter4NewLER26MRadioAudioRoutingObserver @ 10 NONAME
+ _ZN17CRadioAudioRouterD0Ev @ 11 NONAME
+ _ZN17CRadioAudioRouterD1Ev @ 12 NONAME
+ _ZN17CRadioAudioRouterD2Ev @ 13 NONAME
+ _ZN18CRadioRemConTarget4NewLEv @ 14 NONAME
+ _ZN18MRadioEngineLogger6LoggerEv @ 15 NONAME
+ _ZN18TRadioMethodLoggerC1EPKtS1_ @ 16 NONAME
+ _ZN18TRadioMethodLoggerC2EPKtS1_ @ 17 NONAME
+ _ZN18TRadioMethodLoggerD1Ev @ 18 NONAME
+ _ZN18TRadioMethodLoggerD2Ev @ 19 NONAME
+ _ZN19CRadioRoutableAudio14SetAudioOutputEP12CAudioOutput @ 20 NONAME
+ _ZN19CRadioRoutableAudio14SetAudioRouteLEN11RadioEngine16TRadioAudioRouteE @ 21 NONAME
+ _ZN19CRadioRoutableAudio17DeleteAudioOutputEv @ 22 NONAME
+ _ZN19CRadioRoutableAudioC1EP17CRadioAudioRouter @ 23 NONAME
+ _ZN19CRadioRoutableAudioC2EP17CRadioAudioRouter @ 24 NONAME
+ _ZN19CRadioRoutableAudioD0Ev @ 25 NONAME
+ _ZN19CRadioRoutableAudioD1Ev @ 26 NONAME
+ _ZN19CRadioRoutableAudioD2Ev @ 27 NONAME
+ _ZN22CRadioPropertyObserver4NewLER28MRadioPropertyChangeObserverRK4TUidjNS_18TRadioPropertyTypeE @ 28 NONAME
+ _ZN22CRadioPropertyObserver9ActivateLEv @ 29 NONAME
+ _ZN26CRadioRepositoryEntityBaseC2ERK4TUidmR30MRadioRepositoryEntityObserverN7CActive9TPriorityE @ 30 NONAME
+ _ZN26CRadioRepositoryEntityBaseD0Ev @ 31 NONAME
+ _ZN26CRadioRepositoryEntityBaseD1Ev @ 32 NONAME
+ _ZN26CRadioRepositoryEntityBaseD2Ev @ 33 NONAME
+ _ZN26CRadioSystemEventCollector4NewLEv @ 34 NONAME
+ _ZN26CRadioSystemEventCollectorD0Ev @ 35 NONAME
+ _ZN26CRadioSystemEventCollectorD1Ev @ 36 NONAME
+ _ZN26CRadioSystemEventCollectorD2Ev @ 37 NONAME
+ _ZNK19CRadioRoutableAudio21AudioRoutingSupportedEv @ 38 NONAME
+ _ZNK22CRadioPropertyObserver8ValueDesEv @ 39 NONAME
+ _ZNK22CRadioPropertyObserver8ValueIntEv @ 40 NONAME
+ _ZNK22CRadioPropertyObserver9ValueDes8Ev @ 41 NONAME
+ _ZTI15CRadioEngineTls @ 42 NONAME
+ _ZTI19CRadioRoutableAudio @ 43 NONAME
+ _ZTI26CRadioRepositoryEntityBase @ 44 NONAME
+ _ZTV15CRadioEngineTls @ 45 NONAME
+ _ZTV19CRadioRoutableAudio @ 46 NONAME
+ _ZTV26CRadioRepositoryEntityBase @ 47 NONAME
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioengine/utils/stub/group/bld.inf Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,28 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+#include "../../../group/buildflags.hrh"
+
+#include <platform_paths.hrh>
+
+PRJ_PLATFORMS
+WINSCW ARMV5
+
+PRJ_EXPORTS
+
+PRJ_MMPFILES
+radioengineutils_stub.mmp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioengine/utils/stub/group/radioengineutils_stub.mmp Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,80 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+#include "../../../group/buildflags.hrh"
+
+#include <platform_paths.hrh>
+
+#include <data_caging_paths.hrh>
+
+TARGET fmradioengineutils_stub.dll
+TARGETTYPE DLL
+UID 0x1000008D 0x01000002
+VERSION 10.0
+
+CAPABILITY CAP_GENERAL_DLL
+VENDORID VID_DEFAULT
+PAGED
+SMPSAFE
+
+USERINCLUDE ../inc
+USERINCLUDE ../../api
+USERINCLUDE ../../inc
+USERINCLUDE /sf/mw/mmmw/mmserv/radioutility/inc
+USERINCLUDE /sf/mw/mmmw/mmserv/inc
+USERINCLUDE /sf/mw/mmmw/inc
+
+APP_LAYER_SYSTEMINCLUDE
+SYSTEMINCLUDE /epoc32/include/remcon
+SYSTEMINCLUDE /epoc32/include/internal
+SYSTEMINCLUDE /epoc32/include/mmf/common
+SYSTEMINCLUDE /epoc32/include/platform/mw
+
+SOURCEPATH ../../src
+SOURCE radioengineutils.cpp
+SOURCE cradioenginetls.cpp
+SOURCE cradioroutableaudio.cpp
+SOURCE cradioaudiorouter.cpp
+SOURCE cradiopropertyobserver.cpp
+SOURCE cradioremcontarget.cpp
+SOURCE cradiorepositoryentitybase.cpp
+SOURCE cradiosystemeventcollector.cpp
+SOURCE cradiosystemeventcollectorimp.cpp
+SOURCE cradiosystemeventdetector.cpp
+SOURCE cradioenginelogger.cpp
+
+SOURCEPATH ../src
+SOURCE cradioaccessoryobserver_stub.cpp
+SOURCE cradioremcontargetimp_stub.cpp
+
+LIBRARY bafl.lib
+LIBRARY accclient.lib
+LIBRARY accpolicy.lib
+LIBRARY centralrepository.lib
+LIBRARY commonengine.lib
+LIBRARY efsrv.lib
+LIBRARY euser.lib
+LIBRARY cone.lib
+LIBRARY remconcoreapi.lib
+LIBRARY remconextensionapi.lib
+LIBRARY remconinterfacebase.lib
+LIBRARY featmgr.lib
+LIBRARY flogger.lib
+LIBRARY Radio_Utility_Stub.lib
+LIBRARY RadioSession_Stub.lib // SRadioStubManager functions
+
+MACRO STUB_CONSTELLATION
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioengine/utils/stub/inc/cradioaccessoryobserver_stub.h Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,90 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+#ifndef CRADIOACCESSORYOBSERVERSTUB_H
+#define CRADIOACCESSORYOBSERVERSTUB_H
+
+#include <AccessoryServer.h>
+#include <AccessoryConnection.h>
+#include <AccPolSubblockNameArray.h>
+#include <RadioStubManager.h>
+
+class MRadioHeadsetEventObserver;
+
+/**
+ * Observer of accessory states.
+ *
+ * Instance of this class observes notifications of headset state changes.
+ * In its turn it sends notifications to its observer of those changes.
+ *
+ */
+NONSHARABLE_CLASS( CRadioAccessoryObserver ): public CBase
+{
+public:
+
+ /**
+ * C++ default constructor.
+ */
+ CRadioAccessoryObserver();
+
+ /**
+ * Static constructor.
+ */
+ static CRadioAccessoryObserver* NewL();
+
+ /**
+ * Destructor.
+ */
+ virtual ~CRadioAccessoryObserver();
+
+ /**
+ * Sets observer. The observer will be notified when headset has been
+ * pressed or headset is connected/disconnected.
+ *
+ * @param aObserver Observer
+ */
+ void SetObserver( MRadioHeadsetEventObserver* aObserver );
+
+ /**
+ * Tells if there is a headset connected.
+ *
+ * @return <code>ETrue </code> if headset accessory is connected,
+ * <code>EFalse</code> otherwise
+ */
+ TBool IsHeadsetConnectedL() const;
+
+private:
+
+ /**
+ * By default Symbian 2nd phase constructor is private.
+ *
+ * @param aAccessoryServer Existing session for The Accessory Server.
+ */
+ void ConstructL();
+
+
+private: // data
+
+ // RadioStubManager pointer points inside RadioStubManagerChunk
+ SRadioStubManager* iRadioStubManager;
+
+ // RadioStubManagerChunk handle
+ RChunk iRadioStubManagerChunk;
+
+};
+
+#endif // CRADIOACCESSORYOBSERVERSTUB_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioengine/utils/stub/inc/cradioremcontargetimp_stub.h Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,116 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+#ifndef CRADIOREMCONTARGETIMP_H
+#define CRADIOREMCONTARGETIMP_H
+
+// System includes
+#include <RemConCallHandlingTargetObserver.h>
+#include <remconcoreapitargetobserver.h>
+#include <RadioStubManager.h>
+
+// User includes
+#include "cradioremcontarget.h"
+
+// Forward declarations
+class CRemConCallHandlingTarget;
+class CRemConCoreApiTarget;
+class CRemConInterfaceSelector;
+
+// Class declaration
+
+/**
+ * Media key listener
+ */
+NONSHARABLE_CLASS( CRadioRemConTargetImp ) : public CRadioRemConTarget
+ , public MRemConCoreApiTargetObserver
+ , public MRemConCallHandlingTargetObserver
+ {
+public:
+
+ static CRadioRemConTargetImp* NewL();
+
+ virtual ~CRadioRemConTargetImp();
+
+private:
+
+// from base class CRadioRemConTarget
+
+ void SetControlEventObserver( MRadioControlEventObserver* aControlEventObserver );
+
+// from base class MRemConCoreApiTargetObserver
+
+ void MrccatoCommand( TRemConCoreApiOperationId aOperationId, TRemConCoreApiButtonAction aButtonAct );
+ void MrccatoPlay( TRemConCoreApiPlaybackSpeed aSpeed, TRemConCoreApiButtonAction aButtonAct );
+ void MrccatoTuneFunction( TBool aTwoPart, TUint aMajorChannel, TUint aMinorChannel, TRemConCoreApiButtonAction aButtonAct );
+ void MrccatoSelectDiskFunction( TUint aDisk, TRemConCoreApiButtonAction aButtonAct );
+ void MrccatoSelectAvInputFunction( TUint8 aAvInputSignalNumber, TRemConCoreApiButtonAction aButtonAct );
+ void MrccatoSelectAudioInputFunction( TUint8 aAudioInputSignalNumber, TRemConCoreApiButtonAction aButtonAct );
+
+// from base class MRemConCallHandlingTargetObserver
+
+ void AnswerCall();
+ void AnswerEndCall();
+ void DialCall( const TDesC8& aTelNumber );
+ void EndCall();
+ void GenerateDTMF( const TChar aChar );
+ void LastNumberRedial();
+ void MultipartyCalling( const TDesC8& aData );
+ void SpeedDial( const TInt aIndex );
+ void VoiceDial( const TBool aActivate );
+
+private:
+
+ CRadioRemConTargetImp();
+
+ void ConstructL();
+
+ /**
+ * Callback for repeat timer.
+ * @param aPtr Pointer to this class.
+ */
+ static TInt RepeatTimerCallback( TAny* aPtr );
+
+private: // data
+
+ /** Pointer to observer in UI side, can be NULL. Not owned. */
+ MRadioControlEventObserver* iObserver;
+
+ /** RemCon interface selector. */
+ CRemConInterfaceSelector* iInterfaceSelector;
+
+ /** RemCon Core API target class. */
+ CRemConCoreApiTarget* iCoreTarget;
+
+ /** RemCon Call API target class. */
+ CRemConCallHandlingTarget* iCallTarget;
+
+ /** Timer for generating repeat events. */
+ CPeriodic* iRepeatTimer;
+
+ /** Operation id to repeat. */
+ TRemConCoreApiOperationId iRepeatId;
+
+ // RadioStubManager pointer points inside RadioStubManagerChunk
+ SRadioStubManager* iRadioStubManager;
+
+ // RadioStubManagerChunk handle
+ RChunk iRadioStubManagerChunk;
+
+ };
+
+#endif // CRADIOREMCONTARGETIMP_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioengine/utils/stub/src/cradioaccessoryobserver_stub.cpp Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,113 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+#include "cradioenginelogger.h"
+
+#include "cradioaccessoryobserver_stub.h"
+#include "mradioheadseteventobserver.h"
+
+#define STUB iRadioStubManager->iAccessoryObserver
+
+// ---------------------------------------------------------------------------
+//
+// ---------------------------------------------------------------------------
+//
+CRadioAccessoryObserver::CRadioAccessoryObserver()
+ {
+ LOG_METHOD_AUTO;
+ }
+
+
+// ---------------------------------------------------------------------------
+//
+// ---------------------------------------------------------------------------
+//
+void CRadioAccessoryObserver::ConstructL()
+ {
+ LOG_METHOD_AUTO;
+ // Open chunk for test configuration/control data
+ TInt err = iRadioStubManagerChunk.OpenGlobal(
+ KRadioStubManagerLocalChunkName,
+ EFalse, // == Read | Write
+ EOwnerThread );
+ User::LeaveIfError( err );
+ if ( sizeof(SRadioStubManager) > iRadioStubManagerChunk.MaxSize() )
+ {
+ User::Leave( KErrTooBig );
+ }
+ TUint8* basePtr = iRadioStubManagerChunk.Base();
+ User::LeaveIfNull( basePtr );
+ iRadioStubManager = (SRadioStubManager*)basePtr;
+ if ( STUB.iLeaveNewL.iError )
+ {
+ User::Leave( STUB.iLeaveNewL.iError );
+ }
+ if ( STUB.iLeaveConstructL.iError )
+ {
+ User::Leave( STUB.iLeaveConstructL.iError );
+ }
+ }
+
+// ---------------------------------------------------------------------------
+//
+// ---------------------------------------------------------------------------
+//
+CRadioAccessoryObserver* CRadioAccessoryObserver::NewL()
+ {
+ LOG_METHOD_AUTO;
+ CRadioAccessoryObserver* self = new( ELeave ) CRadioAccessoryObserver;
+ CleanupStack::PushL( self );
+ self->ConstructL();
+ CleanupStack::Pop( self );
+ return self;
+ }
+
+// ---------------------------------------------------------------------------
+//
+// ---------------------------------------------------------------------------
+//
+CRadioAccessoryObserver::~CRadioAccessoryObserver()
+ {
+ LOG_METHOD_AUTO;
+ iRadioStubManagerChunk.Close();
+ }
+
+// ---------------------------------------------------------------------------
+//
+// ---------------------------------------------------------------------------
+//
+TBool CRadioAccessoryObserver::IsHeadsetConnectedL() const
+ {
+ LOG_METHOD_AUTO;
+ if ( STUB.iLeaveIsHeadsetConnectedL.iError )
+ {
+ User::Leave( STUB.iLeaveIsHeadsetConnectedL.iError );
+ }
+ return STUB.iHeadsetConnected;
+ }
+
+
+// ---------------------------------------------------------------------------
+//
+// ---------------------------------------------------------------------------
+//
+void CRadioAccessoryObserver::SetObserver( MRadioHeadsetEventObserver* aObserver )
+ {
+ LOG_METHOD_AUTO;
+ STUB.iObserver = aObserver;
+ }
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radioengine/utils/stub/src/cradioremcontargetimp_stub.cpp Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,460 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+// System includes
+#include <RemConCallHandlingTarget.h>
+#include <remconcoreapitarget.h>
+#include <remconinterfaceselector.h>
+
+// User includes
+#include "cradioenginelogger.h"
+#include "cradioremcontargetimp_stub.h"
+#include "mradiocontroleventobserver.h"
+#include "radioengineutils.h"
+
+#define STUB iRadioStubManager->iRemConTarget
+
+// Constants
+const TInt KVRVolumeTimerInitialDelay = 0; // Initial timer for headset volume up/down press event should expire immediately
+
+// ================= MEMBER FUNCTIONS =======================
+
+// ---------------------------------------------------------------------------
+//
+// ---------------------------------------------------------------------------
+//
+CRadioRemConTargetImp::CRadioRemConTargetImp()
+ {
+ LOG_METHOD_AUTO;
+ }
+
+// ---------------------------------------------------------------------------
+//
+// ---------------------------------------------------------------------------
+//
+void CRadioRemConTargetImp::ConstructL()
+ {
+ LOG_METHOD_AUTO;;
+ // Open chunk for test configuration/control data
+ TInt err = iRadioStubManagerChunk.OpenGlobal(
+ KRadioStubManagerLocalChunkName,
+ EFalse, // == Read | Write
+ EOwnerThread );
+ User::LeaveIfError( err );
+ if ( sizeof(SRadioStubManager) > iRadioStubManagerChunk.MaxSize() )
+ {
+ User::Leave( KErrTooBig );
+ }
+ TUint8* basePtr = iRadioStubManagerChunk.Base();
+ User::LeaveIfNull( basePtr );
+ iRadioStubManager = (SRadioStubManager*)basePtr;
+ if ( STUB.iLeaveNewL.iError )
+ {
+ User::Leave( STUB.iLeaveNewL.iError );
+ }
+ if ( STUB.iLeaveConstructL.iError )
+ {
+ User::Leave( STUB.iLeaveConstructL.iError );
+ }
+ STUB.iRemConCoreApiTargetObserver = this;
+ STUB.iRemConCallHandlingTargetObserver = this;
+ RadioEngineUtils::InitializeL();
+ // Create interface selector.
+ //iInterfaceSelector = CRemConInterfaceSelector::NewL();
+ // Create a new CRemConCoreApiTarget, owned by the interface selector.
+ //iCoreTarget = CRemConCoreApiTarget::NewL( *iInterfaceSelector, *this );
+ // Create a new CRemConCallHandlingTarget, owned by the interface selector.
+ //iCallTarget = CRemConCallHandlingTarget::NewL( *iInterfaceSelector, *this );
+ // Start being a target.
+ //iInterfaceSelector->OpenTargetL();
+ // Create repeat timer.
+ iRepeatTimer = CPeriodic::NewL( CActive::EPriorityStandard );
+ }
+
+// ---------------------------------------------------------------------------
+//
+// ---------------------------------------------------------------------------
+//
+CRadioRemConTargetImp* CRadioRemConTargetImp::NewL()
+ {
+ LOG_METHOD_AUTO;;
+ CRadioRemConTargetImp* self = new ( ELeave ) CRadioRemConTargetImp();
+ CleanupStack::PushL( self );
+ self->ConstructL();
+ CleanupStack::Pop();
+ return self;
+ }
+
+// ---------------------------------------------------------------------------
+//
+// ---------------------------------------------------------------------------
+//
+CRadioRemConTargetImp::~CRadioRemConTargetImp()
+ {
+ LOG_METHOD_AUTO;;
+ if ( iRepeatTimer )
+ {
+ iRepeatTimer->Cancel();
+ }
+ delete iRepeatTimer;
+ //delete iInterfaceSelector; //deletes also iCallTarget and iCoreTarget
+ //iCoreTarget = NULL;
+ //iCallTarget = NULL;
+ RadioEngineUtils::Release();
+ iRadioStubManagerChunk.Close();
+ }
+
+// ---------------------------------------------------------------------------
+//
+// ---------------------------------------------------------------------------
+//
+void CRadioRemConTargetImp::SetControlEventObserver( MRadioControlEventObserver* aControlEventObserver )
+ {
+ LOG_METHOD_AUTO;;
+ iObserver = aControlEventObserver;
+ }
+
+// ---------------------------------------------------------------------------
+//
+// ---------------------------------------------------------------------------
+//
+void CRadioRemConTargetImp::MrccatoCommand( TRemConCoreApiOperationId aOperationId,
+ TRemConCoreApiButtonAction aButtonAct )
+ {
+ LOG_FORMAT( "aOperationId = %d, aButtonAct = %d", aOperationId, aButtonAct );
+ LOG_METHOD_AUTO;
+ //TODO: Refactor
+ if ( iObserver )
+ {
+ switch ( aOperationId )
+ {
+ case ERemConCoreApiChannelUp:
+ {
+ if ( aButtonAct == ERemConCoreApiButtonClick )
+ {
+ TRAP_IGNORE( iObserver->ChannelUpL( ETrue ); iObserver->ChannelUpL( EFalse ))
+ }
+ else if ( aButtonAct == ERemConCoreApiButtonPress )
+ {
+ TRAP_IGNORE( iObserver->ChannelUpL( ETrue ))
+ }
+ else if ( aButtonAct == ERemConCoreApiButtonRelease )
+ {
+ TRAP_IGNORE( iObserver->ChannelUpL( EFalse ))
+ }
+ else {}
+ break;
+ }
+ case ERemConCoreApiChannelDown:
+ {
+ if ( aButtonAct == ERemConCoreApiButtonClick )
+ {
+ TRAP_IGNORE( iObserver->ChannelDownL( ETrue ); iObserver->ChannelDownL( EFalse ))
+ }
+ else if ( aButtonAct == ERemConCoreApiButtonPress )
+ {
+ TRAP_IGNORE( iObserver->ChannelDownL( ETrue ))
+ }
+ else if ( aButtonAct == ERemConCoreApiButtonRelease )
+ {
+ TRAP_IGNORE( iObserver->ChannelDownL( EFalse ))
+ }
+ else {}
+ break;
+ }
+ case ERemConCoreApiVolumeUp:
+ {
+ if ( aButtonAct == ERemConCoreApiButtonClick )
+ {
+ TRAP_IGNORE( iObserver->VolumeUpL( ETrue ); iObserver->VolumeUpL( EFalse ))
+ }
+ else if ( aButtonAct == ERemConCoreApiButtonPress )
+ {
+ iRepeatTimer->Cancel();
+ iRepeatId = ERemConCoreApiVolumeUp;
+// iRepeatTimer->Start( KVRVolumeTimerInitialDelay, KAknStandardKeyboardRepeatRate, TCallBack( RepeatTimerCallback, this ));
+ iRepeatTimer->Start( KVRVolumeTimerInitialDelay, 1000000, TCallBack( RepeatTimerCallback, this ));
+ }
+ else if ( aButtonAct == ERemConCoreApiButtonRelease )
+ {
+ iRepeatTimer->Cancel();
+ }
+ else {}
+ break;
+ }
+ case ERemConCoreApiVolumeDown:
+ {
+ if ( aButtonAct == ERemConCoreApiButtonClick )
+ {
+ TRAP_IGNORE( iObserver->VolumeDownL( ETrue ); iObserver->VolumeDownL( EFalse ))
+ }
+ else if ( aButtonAct == ERemConCoreApiButtonPress )
+ {
+ iRepeatTimer->Cancel();
+ iRepeatId = ERemConCoreApiVolumeDown;
+// iRepeatTimer->Start( KVRVolumeTimerInitialDelay, KAknStandardKeyboardRepeatRate, TCallBack( RepeatTimerCallback, this ));
+ iRepeatTimer->Start( KVRVolumeTimerInitialDelay, 1000000, TCallBack( RepeatTimerCallback, this ));
+ }
+ else if ( aButtonAct == ERemConCoreApiButtonRelease )
+ {
+ iRepeatTimer->Cancel();
+ }
+ else {}
+ break;
+ }
+ case ERemConCoreApiStop:
+ {
+ if ( aButtonAct == ERemConCoreApiButtonClick )
+ {
+ TRAP_IGNORE( iObserver->StopL( ETrue ); iObserver->StopL( EFalse ))
+ }
+ break;
+ }
+ case ERemConCoreApiBackward:
+ case ERemConCoreApiRewind:
+ {
+ if ( aButtonAct == ERemConCoreApiButtonPress )
+ {
+ TRAP_IGNORE( iObserver->RewindL( ETrue ))
+ }
+ else if ( aButtonAct == ERemConCoreApiButtonRelease )
+ {
+ TRAP_IGNORE( iObserver->RewindL( EFalse ))
+ }
+ else if ( aButtonAct == ERemConCoreApiButtonClick )
+ {
+ TRAP_IGNORE( iObserver->BackwardL( ETrue ); iObserver->BackwardL( EFalse ))
+ }
+ else {}
+ break;
+ }
+ case ERemConCoreApiForward:
+ case ERemConCoreApiFastForward:
+ {
+ if ( aButtonAct == ERemConCoreApiButtonPress )
+ {
+ TRAP_IGNORE( iObserver->FastForwardL( ETrue ))
+ }
+ else if ( aButtonAct == ERemConCoreApiButtonRelease )
+ {
+ TRAP_IGNORE( iObserver->FastForwardL( EFalse ))
+ }
+ else if ( aButtonAct == ERemConCoreApiButtonClick )
+ {
+ TRAP_IGNORE( iObserver->ForwardL( ETrue ); iObserver->ForwardL( EFalse ))
+ }
+ else {}
+ break;
+ }
+ case ERemConCoreApiPlay:
+ case ERemConCoreApiPause:
+ case ERemConCoreApiPausePlayFunction:
+ {
+ if ( aButtonAct == ERemConCoreApiButtonClick )
+ {
+ TRAP_IGNORE( iObserver->PausePlayL( ETrue ); iObserver->PausePlayL( EFalse ))
+ }
+ break;
+ }
+ default:
+ {
+ break;
+ }
+ }
+ }
+ }
+
+// ---------------------------------------------------------------------------
+//
+// ---------------------------------------------------------------------------
+//
+void CRadioRemConTargetImp::MrccatoPlay( TRemConCoreApiPlaybackSpeed /*aSpeed*/,
+ TRemConCoreApiButtonAction aButtonAct )
+ {
+ LOG_METHOD_AUTO;
+ if ( iObserver )
+ {
+ if ( aButtonAct == ERemConCoreApiButtonClick )
+ {
+ TRAP_IGNORE( iObserver->PlayL( ETrue ); iObserver->PlayL( EFalse ))
+ }
+ }
+ }
+
+// ---------------------------------------------------------------------------
+//
+// ---------------------------------------------------------------------------
+//
+void CRadioRemConTargetImp::MrccatoTuneFunction( TBool /*aTwoPart*/,
+ TUint /*aMajorChannel*/,
+ TUint /*aMinorChannel*/,
+ TRemConCoreApiButtonAction /*aButtonAct*/)
+ {
+ LOG_METHOD_AUTO;
+ }
+
+// ---------------------------------------------------------------------------
+//
+// ---------------------------------------------------------------------------
+//
+void CRadioRemConTargetImp::MrccatoSelectDiskFunction( TUint /*aDisk*/,
+ TRemConCoreApiButtonAction /*aButtonAct*/)
+ {
+ LOG_METHOD_AUTO;
+ }
+
+// ---------------------------------------------------------------------------
+//
+// ---------------------------------------------------------------------------
+//
+void CRadioRemConTargetImp::MrccatoSelectAvInputFunction( TUint8 /*aAvInputSignalNumber*/,
+ TRemConCoreApiButtonAction /*aButtonAct*/)
+ {
+ LOG_METHOD_AUTO;
+ }
+
+// ---------------------------------------------------------------------------
+//
+// ---------------------------------------------------------------------------
+//
+void CRadioRemConTargetImp::MrccatoSelectAudioInputFunction( TUint8 /*aAudioInputSignalNumber*/,
+ TRemConCoreApiButtonAction /*aButtonAct*/)
+ {
+ LOG_METHOD_AUTO;
+ }
+
+// ---------------------------------------------------------------------------
+//
+// ---------------------------------------------------------------------------
+//
+TInt CRadioRemConTargetImp::RepeatTimerCallback( TAny* aPtr )
+ {
+ LOG_METHOD_AUTO;
+
+ CRadioRemConTargetImp* self = reinterpret_cast<CRadioRemConTargetImp*>( aPtr );
+
+ if ( self )
+ {
+ if ( self->iObserver )
+ {
+ switch ( self->iRepeatId )
+ {
+ case ERemConCoreApiVolumeUp:
+ {
+ TRAP_IGNORE( self->iObserver->VolumeUpL( ETrue ); self->iObserver->VolumeUpL( EFalse ))
+ break;
+ }
+ case ERemConCoreApiVolumeDown:
+ {
+ TRAP_IGNORE( self->iObserver->VolumeDownL( ETrue ); self->iObserver->VolumeDownL( EFalse ))
+ break;
+ }
+ default:
+ {
+ break;
+ }
+ }
+ }
+ }
+
+ return KErrNone;
+ }
+
+// ---------------------------------------------------------------------------
+//
+// ---------------------------------------------------------------------------
+//
+void CRadioRemConTargetImp::AnswerCall()
+ {
+ LOG_METHOD_AUTO;
+ }
+
+// ---------------------------------------------------------------------------
+//
+// ---------------------------------------------------------------------------
+//
+void CRadioRemConTargetImp::AnswerEndCall()
+ {
+ LOG_METHOD_AUTO;
+ if ( iObserver )
+ {
+ TRAP_IGNORE( iObserver->AnswerEndCallL())
+ }
+ }
+
+// ---------------------------------------------------------------------------
+//
+// ---------------------------------------------------------------------------
+//
+void CRadioRemConTargetImp::DialCall( const TDesC8& /*aTelNumber*/ )
+ {
+ LOG_METHOD_AUTO;
+ }
+
+// ---------------------------------------------------------------------------
+//
+// ---------------------------------------------------------------------------
+//
+void CRadioRemConTargetImp::EndCall()
+ {
+ LOG_METHOD_AUTO;
+ }
+
+// ---------------------------------------------------------------------------
+//
+// ---------------------------------------------------------------------------
+//
+void CRadioRemConTargetImp::GenerateDTMF( const TChar /*aChar*/ )
+ {
+ LOG_METHOD_AUTO;
+ }
+
+// ---------------------------------------------------------------------------
+//
+// ---------------------------------------------------------------------------
+//
+void CRadioRemConTargetImp::LastNumberRedial()
+ {
+ LOG_METHOD_AUTO;
+ }
+
+// ---------------------------------------------------------------------------
+//
+// ---------------------------------------------------------------------------
+//
+void CRadioRemConTargetImp::MultipartyCalling( const TDesC8& /*aData*/ )
+ {
+ LOG_METHOD_AUTO;
+ }
+
+// ---------------------------------------------------------------------------
+//
+// ---------------------------------------------------------------------------
+//
+void CRadioRemConTargetImp::SpeedDial( const TInt /*aIndex*/ )
+ {
+ LOG_METHOD_AUTO;
+ }
+
+// ---------------------------------------------------------------------------
+//
+// ---------------------------------------------------------------------------
+//
+void CRadioRemConTargetImp::VoiceDial( const TBool /*aActivate*/ )
+ {
+ LOG_METHOD_AUTO;
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radiohswidget/buildflags.pri Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,82 @@
+#
+# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description:
+#
+
+# ##########################################################
+# Start of Flag definitions
+# Add or remove comments to disable or enable the features
+# ##########################################################
+
+# ##########################################################
+# Start of Logging flag definitions
+# ##########################################################
+
+# Full logging flag that enables the full logging including also timestamps
+# Enabled by default in debug builds
+CONFIG(debug, debug|release) : LOGGING_FLAGS += LOGGING_ENABLED
+
+# Uncomment to enable full logging in release builds
+# LOGGING_FLAGS *= LOGGING_ENABLED
+
+# Timestamp logging flag that enables only timestamp logging
+# LOGGING_FLAGS += TIMESTAMP_LOGGING_ENABLED
+
+# Combines Ui and Engine logs by feeding UI traces to the engine logger
+# LOGGING_FLAGS += COMBINE_WITH_ENGINE_LOGGER
+
+# Logging level
+# 1 - Normal level
+# 2 - More verbose level
+# 3 - Most verbose level
+LOGGING_FLAGS += LOGGING_LEVEL=1
+
+# Select which radio component is being logged
+# 1 - Radio application
+# 2 - Radio homescreen widget
+LOGGING_FLAGS += LOGGED_COMPONENT=2
+
+contains(LOGGING_FLAGS, TIMESTAMP_LOGGING_ENABLED)|contains(LOGGING_FLAGS, LOGGING_ENABLED) {
+
+ # Writes debug prints to file if enabled
+ #LOGGING_FLAGS += TRACE_TO_FILE
+
+ # Settings for the log file name
+ symbian:contains(LOGGING_FLAGS, TRACE_TO_FILE) {
+ LOGGING_FLAGS += \"TRACE_OUTPUT_FILE=\\\"c:/logs/radio/radiohswidget.txt\\\"\"
+ LOGGING_FLAGS += FILTER_BY_LOGMARKER=true
+ }
+}
+
+# Method for testing signal-slot connections
+# 1 - Log failed connection
+# 2 - Log failed connection and halt debugger
+LOGGING_FLAGS += CONNECT_TEST_MODE=2
+
+# Logging is always enabled in Win32 environment
+win32:LOGGING_FLAGS *= LOGGING_ENABLED
+
+DEFINES += $$LOGGING_FLAGS
+
+# ##########################################################
+# End of Flag definitions
+# ##########################################################
+
+# $$_PRO_FILE_PWD_ points to the directory of the pro file
+MOC_DIR = $$_PRO_FILE_PWD_/tmp
+RCC_DIR = $$_PRO_FILE_PWD_/tmp
+OBJECTS_DIR = $$_PRO_FILE_PWD_/tmp
+UI_DIR = $$_PRO_FILE_PWD_/tmp
+UI_HEADERS_DIR = $$_PRO_FILE_PWD_/tmp
+UI_SOURCES_DIR = $$_PRO_FILE_PWD_/tmp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radiohswidget/inc/radiohswidget.h Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,261 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: FM Radio home screen widget
+*
+*/
+
+#ifndef RADIOHSWIDGET_H
+#define RADIOHSWIDGET_H
+
+// System includes
+#include <HbWidget>
+
+// Forward declarations
+class HbLabel;
+class HbPushButton;
+class XQSettingsManager;
+class XQSettingsKey;
+class RadioHsWidgetProfileReader;
+class RadioHsWidgetRadioServiceClient;
+class QGraphicsLinearLayout;
+
+/*!
+ \namespace FmRadio
+ \brief Wraps enumerators for radio state and service request visibility.
+ */
+namespace FmRadio
+{
+ /*! Enum for radio application states. */
+ enum State
+ {
+ StateUndefined,
+ StateNotRunning,
+ StateStarting,
+ StateRunning,
+ StateSeeking,
+ StateAntennaNotConnected,
+ StateClosing
+ };
+
+ /*! Enum for controlling the visibility of the radio application. */
+ enum VisibiltyAfterRequest
+ {
+ VisibiltyDoNotChange,
+ VisibiltyToForeground,
+ VisibiltyToBackground
+ };
+
+}
+
+class RadioHsWidget : public HbWidget
+{
+ Q_OBJECT
+
+public:
+ RadioHsWidget(QGraphicsItem *parent = 0, Qt::WindowFlags flags = 0);
+ ~RadioHsWidget();
+
+ void handleRadioInformationChange(const int informationType,
+ const QVariant &information);
+ void handleRadioStateChange(const QVariant &value);
+
+private:
+ /*! Enum for information area layout states. */
+ enum InformationAreaLayout
+ {
+ OneRow,
+ TwoRows,
+ Animation
+ };
+
+ /*! Enum for control button identifier. */
+ enum ControlButtonIdentifier{
+ Power,
+ Previous,
+ Next
+ };
+
+ /*! Enum for control button state. */
+ enum ControlButtonState{
+ Normal,
+ Pressed,
+ Disabled,
+ Latched
+ };
+
+
+ /*! Enum for information types published by radio. */
+ enum FmRadioInformationType {
+ Frequency,
+ StationName,
+ RadioText,
+ DynamicPsName,
+ Pty
+ };
+
+signals:
+
+ /*
+ This signal allows your widget to save its properties persistently.
+ Once properties are saved, the user may close and reopen the widget,
+ and the stored properties will still be available. The names
+ parameter contains names for the properties you want to store. The
+ home screen framework reads the corresponding property values from
+ the widget by calling QObject::property() method. Currently only
+ QString type properties are supported. The home screen framework
+ writes widget's properties just before calling the onInitialize slot.
+ Both compile-time and dynamic properties are supported. Optional.
+ */
+ //void setPreferences(const QStringList &names);
+
+ /*
+ Your widget can notify the home screen framework about its completion
+ by emitting this signal. With the current implementation, the
+ framework removes the widget after receiving this signal. Optional.
+ */
+ //void finished();
+
+ /*!
+ Widget can notify the home screen framework about errors in its
+ execution by emitting this signal. With the current implementation,
+ the framework removes the widget after receiving this signal.
+ Optional.
+ */
+ void error();
+
+public slots:
+ /* These slots (prefixed with "on") are called by the home screen
+ * framework for controlling the widget's state during its lifetime.
+ * They are automatically connected by the framework.
+ */
+
+ /* Implement this slot if you want to be notified when your widget is
+ * added to the home screen. Upon receiving this event, your widget can
+ * perform any necessary initialization operations, such as preparing
+ * connections and allocating resources. Optional.
+ */
+ void onInitialize();
+
+ /* This slot is called when your widget is shown in the home screen. You
+ * use this slot to activate your widget and begin processing data again
+ * after being quiescent. Each home screen compatible widget must define
+ * this slot. Mandatory.
+ */
+ void onShow();
+
+ /* This slot is called when your widget is hidden from the home screen.
+ * You use this function to deactivate your widget and put it into a
+ * quiescent state. Each home screen compatible widget must define this
+ * slot. Mandatory.
+ */
+ void onHide();
+
+ /* Implement this slot if you want to be notified when your widget is
+ * removed from the home screen. Upon receiving this event, your widget
+ * should perform any necessary cleanup operations, such as remove cache
+ * files, and release any resources it currently holds. Optional.
+ */
+ //void onUninitialize();
+
+
+ void changeButtonToPressed(int controlButtonId);
+ void changeButtonToReleased(int controlButtonId);
+
+private slots:
+ void closeRadio();
+ void changeToPreviousStation();
+ void changeToNextStation();
+ void changeRadioToForeground();
+ void changeRadioToBackground();
+ void toggleRadioPower();
+
+private:
+ void load(const QString &docml);
+
+ void handleSimilarRadioInformation(
+ const FmRadioInformationType informationType,
+ const QVariant &information);
+ bool updateRadioInformation(const FmRadioInformationType informationType,
+ const QString &information);
+ void changeInRadioInformation();
+ void clearRadioInformation();
+
+ void changeInformationAreaLayout(const InformationAreaLayout layout);
+ void changePowerButtonOn(const bool isPowerOn);
+ void enableStationButtons();
+ void defineButton(HbPushButton &target, const QString &graphicsId,
+ const QStringList &suffix, const QString &icon,
+ const QString &iconColor);
+ void buttonEvent(ControlButtonIdentifier buttonId,
+ const ControlButtonState state);
+ void changeButtonToDisabled(int controlButtonId);
+ void changeButtonToEnabled(int controlButtonId);
+
+ bool radioStartPermission();
+
+private:
+ // Data
+ Q_DISABLE_COPY(RadioHsWidget)
+
+ // UI components.
+ /*! Button for capturing taps on information area. */
+ HbPushButton *mInformationAreaBackgroundButton;
+ /*! Control button for power. */
+ HbPushButton *mPowerButton;
+ /*! Control button for previous station. */
+ HbPushButton *mPreviousButton;
+ /*! Control button for next station. */
+ HbPushButton *mNextButton;
+ /*! Layout for information area. */
+ QGraphicsWidget *mInformationAreaTwoRowsLayout;
+ /*! Label that is shown when there is only one row of information. */
+ HbLabel *mInformationLonelyRowLabel;
+ /*! Label for first row when there is two rows of information. */
+ HbLabel *mInformationFirstRowLabel;
+ // TODO: This label should be modified to support marquee scrolling when Orbit supports it.
+ /*! Label for first second when there is two rows of information. */
+ HbLabel *mInformationSecondRowLabel;
+ /*! Label for displaying animation. */
+ HbLabel *mAnimationIcon;
+
+ /*! Stores the state of the FM Radio application. */
+ FmRadio::State mFmRadioState;
+
+ /*! Stores the count of favorite stations. */
+ int mFavoriteStationCount;
+ /*! Stores the value whether the current station is favorite or not. */
+ bool mCurrentStationIsFavorite;
+
+ /*! Stores the radio information. */
+ QHash<FmRadioInformationType, QString> mRadioInformation;
+ /*!
+ String is used to format the text shown on first or only row from
+ radio information.
+ */
+ QString mRadioInformationFirstRow;
+ /*!
+ String is used to format the text shown on second row from
+ radio information.
+ */
+ QString mRadioInformationSecondRow;
+
+ /*! Profile monitor is used to read P&S keys and profile information. */
+ RadioHsWidgetProfileReader *mProfileMonitor;
+
+ /*! For communicating with the FM Radio through Qt Highway. */
+ RadioHsWidgetRadioServiceClient *mRadioServiceClient;
+
+};
+
+#endif // RADIOHSWIDGET_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radiohswidget/inc/radiohswidgetplugin.h Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,37 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: FM Radio home screen widget plugin
+*
+*/
+
+#ifndef RADIOHSWIDGETPLUGIN_H
+#define RADIOHSWIDGETPLUGIN_H
+
+#include <QObject>
+#include <qserviceplugininterface.h>
+
+QTM_USE_NAMESPACE
+
+class RadioHsWidgetPlugin : public QObject, public QServicePluginInterface
+{
+ Q_OBJECT
+ Q_INTERFACES(QtMobility::QServicePluginInterface)
+
+public:
+ QObject *createInstance(const QServiceInterfaceDescriptor &descriptor,
+ QServiceContext *context,
+ QAbstractSecuritySession *session);
+};
+
+#endif // RADIOHSWIDGETPLUGIN_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radiohswidget/inc/radiohswidgetprofilereader.h Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,64 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: FM Radio widget profile reader
+*
+*/
+
+#ifndef RADIOHSWIDGETPROFILEREADER_H_
+#define RADIOHSWIDGETPROFILEREADER_H_
+
+// System includes
+#include <QObject>
+#include <QVariant>
+
+// Forward declarations
+class RadioHsWidget;
+class XQSettingsManager;
+class XQSettingsKey;
+
+class RadioHsWidgetProfileReader : public QObject
+{
+Q_OBJECT
+
+public:
+ explicit RadioHsWidgetProfileReader(RadioHsWidget *parent = 0);
+ virtual ~RadioHsWidgetProfileReader();
+
+ void startMonitoringRadioRunningStatus();
+
+ bool isCurrentProfileOffline();
+
+public slots:
+ void handleDeletedItem(const XQSettingsKey &key);
+ void handleChanges(const XQSettingsKey &key, const QVariant &value);
+
+private:
+ void radioRunningStatus(const QVariant &value);
+
+private: // data
+ /*!
+ Stores the reference to parent. This is used to call parents
+ functions when notifications are received.
+ */
+ RadioHsWidget &mParent;
+ /*! For getting values and notifications of changes from P&S keys. */
+ XQSettingsManager *mSettingsManager;
+ /*!
+ Stores internally the status of radio application read from the P&S
+ key.
+ */
+ int mRadioStatus;
+};
+
+#endif /* RADIOHSWIDGETPROFILEREADER_H_ */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radiohswidget/inc/radiohswidgetradioserviceclient.h Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,81 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: FM Radio widget radio service client
+*
+*/
+
+#ifndef RADIOHSWIDGETRADIOSERVICECLIENT_H_
+#define RADIOHSWIDGETRADIOSERVICECLIENT_H_
+
+// System includes
+#include <QObject>
+#include <xqappmgr.h>
+
+// User includes
+#include "radiohswidget.h"
+#include "radioservicedef.h"
+
+class RadioHsWidgetRadioServiceClient : public QObject
+{
+Q_OBJECT
+
+public:
+ explicit RadioHsWidgetRadioServiceClient(RadioHsWidget *parent = 0);
+ virtual ~RadioHsWidgetRadioServiceClient();
+
+public:
+ void commandFmRadio(const RadioServiceCommand::CommandId command);
+ void startMonitoring(
+ const FmRadio::VisibiltyAfterRequest visibility);
+ void stopMonitoring();
+ QVariant createRadioNotificationData(int type, const QVariant& data);
+
+private slots:
+ void handleError(const int errorCode, const QString &errorMessage);
+ void handleFmRadioChange(const QVariant &value);
+
+private:
+ void handleRequestError(const int error);
+
+ void createControlServiceRequest();
+ void createMonitorServiceRequest();
+
+ void sendMonitorRequest(
+ const FmRadio::VisibiltyAfterRequest visibility);
+ void sendControlRequest(const QVariant &argument,
+ const FmRadio::VisibiltyAfterRequest visibility);
+
+ void prepareRequestInfo(XQAiwRequest *request,
+ const FmRadio::VisibiltyAfterRequest visibility);
+
+private: // data
+ /*!
+ Stores the reference to parent. This is used to call parents
+ functions when notifications are received.
+ */
+ RadioHsWidget &mParent;
+ /*! Is the request send. */
+ bool mRequestPending;
+ /*! For service and interface listings and request creation. */
+ XQApplicationManager mApplicationManager;
+ /*! Asynchronous monitoring request. */
+ XQAiwRequest* mRadioMonitorRequest;
+ /*! Synchronous control request. */
+ XQAiwRequest* mRadioControlRequest;
+
+ /*! Is the first monitoring request done. */
+ bool mDataInitialized;
+};
+
+#endif /* RADIOHSWIDGETRADIOSERVICECLIENT_H_ */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radiohswidget/locales/compile_ts.bat Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,26 @@
+::
+:: Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+:: All rights reserved.
+:: This component and the accompanying materials are made available
+:: under the terms of "Eclipse Public License v1.0"
+:: which accompanies this distribution, and is available
+:: at the URL "http://www.eclipse.org/legal/epl-v10.html".
+::
+:: Initial Contributors:
+:: Nokia Corporation - initial contribution.
+::
+:: Contributors:
+::
+:: Description:
+::
+
+@echo off
+
+set QM_FILE=fmradiohswidget.qm
+set QM_FILE_EN_US=fmradiohswidget_en_us.qm
+set QM_LOCATION=./
+
+
+ECHO Creating QM file
+call lrelease -idbased fmradiohswidget.ts -qm %QM_LOCATION%%QM_FILE%
+REM call lrelease -idbased fmradiohswidget_en_us.ts -qm %QM_LOCATION%%QM_FILE_EN_US%
Binary file radiohswidget/locales/fmradiohswidget.qm has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radiohswidget/locales/fmradiohswidget.ts Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,516 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="3.0" sourcelanguage="en_GB">
+<context>
+<message numerus="no" id="txt_rad_info_country_music_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Country Music</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_social_affairs_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Social Affairs</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_weather_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Weather</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_personality_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Personality</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_soft_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Soft</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_rhythm_and_blues_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Rhythm and blues</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_information_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Information</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_phone_in_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Phone In</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_current_affairs_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Current affairs</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_alarm_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Alarm</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_leisure_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Leisure</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_childrens_programmes_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Children’s programmes</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_light_classical_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Light classical</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_alarm_test_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Alarm Test</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_religious_talk_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Religious talk</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_list_fm_radio">
+ <comment>Text in a home screen widget information area. Displayed when no station is tuned.</comment>
+ <source>FM Radio</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_list_fm_radio</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>list</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_news_hs">
+ <comment>Displayed in FM Radio home screen widget's information area. Custom layout parent string.</comment>
+ <source>News</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_easy_listening_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Easy Listening</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_top_40_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Top 40</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_public_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Public</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_varied_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Varied</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_nostalgia_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Nostalgia</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_classical_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Classical</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_national_music_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>National Music</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_science_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Science</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_jazz_music_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Jazz Music</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_religious_music_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Religious music</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_other_music_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Other Music</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_folk_music_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Folk Music</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_religion_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Religion</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_soft_rock_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Soft rock</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_adult_hits_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Adult hits</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_drama_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Drama</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_rock_music_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Rock Music</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_serious_classical_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Serious classical</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_college_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>College</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_connect_wired_headset">
+ <comment>Notification text which is displayed in home screen widget, when the headset antenna is not connected.</comment>
+ <source>Connect wired headset.</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_oldies_music_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Oldies Music</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_documentary_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Documentary</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_education_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Education</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_sport_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Sport</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_pop_music_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Pop Music</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_language_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Language</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_classic_rock_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Classic rock</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_list_l1_mhz">
+ <comment>Text in a home screen widget information area. %L1 is the radio station's frequency.</comment>
+ <source>%L1 Mhz</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_list_l1_mhz</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>list</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_soft_rhythm_and_blues_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Soft rhythm and blues</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_culture_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Culture</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_talk_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Talk</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_finance_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Finance</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_activate_radio_in_offline_mode_hs">
+ <comment>Confirmation query which is displayed when the FM Radio is launched from the FM Radio home screen widget while the device is in offline mode. (Note that same text is also in FM radio textmap.)</comment>
+ <source>Activate Fm Radio in off-line mode?</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_rad_info_travel_hs">
+ <comment>Displayed in FM Radio home screen widget's information area.</comment>
+ <source>Travel</source>
+ <translation variants="no" type="unfinished"></translation>
+ <extra-loc-layout_id>txt_rad_info_news_hs</extra-loc-layout_id>
+ <extra-loc-viewid>rad_05</extra-loc-viewid>
+ <extra-loc-positionid>info</extra-loc-positionid>
+ <extra-loc-feature>rad</extra-loc-feature>
+ <extra-loc-blank>False</extra-loc-blank>
+</message>
+</context>
+</TS>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radiohswidget/qmakepluginstubs/fmradiohswidget.qtplugin Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,1 @@
+This file is a Qt plugin stub file. The real Qt plugin is located in /sys/bin. Created:2010-06-22T09:54:17
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radiohswidget/radiohswidget.pro Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,89 @@
+#
+# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description: Example of home screen widget
+#
+
+include(buildflags.pri)
+
+TEMPLATE = lib
+TARGET = fmradiohswidget
+CONFIG += plugin
+CONFIG += hb
+CONFIG += mobility
+MOBILITY = serviceframework
+
+LIBS += -lxqsettingsmanager
+LIBS += -lxqservice
+LIBS += -lxqserviceutil
+
+HEADERS += ./inc/*.h
+SOURCES += ./src/*.cpp
+SOURCES += ../common/radiologger.cpp
+
+INCLUDEPATH += ./inc
+INCLUDEPATH += ../common
+
+UID = 2002E6D6
+
+RESOURCES = resources.qrc
+
+symbian: {
+
+ DESTDIR = /private/20022F35/import/widgetregistry/$${UID}
+
+ TARGET.UID3 = 0x$${UID}
+ TARGET.EPOCALLOWDLLDATA=1
+ TARGET.VID = VID_DEFAULT
+ TARGET.CAPABILITY = CAP_GENERAL_DLL
+
+ plugins.path = $${DESTDIR}
+ plugins.sources = $${TARGET}.dll
+
+ widgetResources.path = $${DESTDIR}
+ widgetResources.sources += resource/$${TARGET}.xml
+ widgetResources.sources += resource/$${TARGET}.manifest
+
+ localisedFiles.path = /resource/qt/translations
+ localisedFiles.sources += ./locales/*.qm
+
+ DEPLOYMENT += plugins
+ DEPLOYMENT += widgetResources
+ DEPLOYMENT += localisedFiles
+
+ MMP_RULES += SMPSAFE
+
+ include(radiohswidget_exports_to_rom.pri)
+}
+
+win32: {
+
+ CONFIG(debug, debug|release) {
+ SUBDIRPART = debug
+ } else {
+ SUBDIRPART = release
+ }
+
+ PLUGIN_SUBDIR = /hsresources/import/widgetregistry/$${UID}
+
+ DESTDIR = $$PWD/../../../../../bin/$${SUBDIRPART}/$${PLUGIN_SUBDIR}
+
+ manifest.path = $${DESTDIR}
+ manifest.files = ./resource/*.manifest ./resource/*.xml ./resource/*.css
+
+ widgetLocalisation.path = $$PWD/../../../../../bin/$${SUBDIRPART}/resource/qt/translations
+ widgetLocalisation.files += ./locales/*.qm
+
+ INSTALLS += manifest
+}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radiohswidget/radiohswidget_exports_to_rom.pri Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,34 @@
+#
+# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description:
+#
+
+BLD_INF_RULES.prj_exports += \
+"$${LITERAL_HASH}include <platform_paths.hrh>"
+
+#iby exports to core
+BLD_INF_RULES.prj_exports += \
+"rom/fmradiohswidget.iby CORE_APP_LAYER_IBY_EXPORT_PATH(fmradiohswidget.iby)"
+
+#iby exports to language
+#BLD_INF_RULES.prj_exports += \
+#"rom/fmradiohswidget_resources.iby LANGUAGE_APP_LAYER_IBY_EXPORT_PATH(fmradiohswidget_resources.iby)"
+
+BLD_INF_RULES.prj_extensions += \
+$$LITERAL_HASH"ifdef MARM" \
+ " START EXTENSION app-services/buildstubsis" \
+ " OPTION SRCDIR rom/" \
+ " OPTION SISNAME fmradiohswidget_stub" \
+ " END" \
+$$LITERAL_HASH"endif"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radiohswidget/resource/fmradiohswidget.docml Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<hbdocument version="1.1">
+ <widget name="mainLayout" type="HbWidget">
+ <widget name="contentLayout" type="HbWidget">
+ <widget name="controlButtons" type="HbWidget">
+ <widget name="powerButton" type="HbPushButton">
+ <icon iconName="qtg_mono_power" name="icon"/>
+ <string name="text"/>
+ </widget>
+ <widget name="previousPushButton" type="HbPushButton">
+ <icon iconName="qtg_mono_previous" name="icon"/>
+ <string name="text"/>
+ </widget>
+ <widget name="nextPushButton" type="HbPushButton">
+ <icon iconName="qtg_mono_next" name="icon"/>
+ <string name="text"/>
+ </widget>
+ <real name="z" value="3"/>
+ <sizepolicy horizontalPolicy="Preferred" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
+ <sizehint height="8un" type="PREFERRED" width="32un"/>
+ <sizehint height="8un" type="MINIMUM" width="32un"/>
+ <layout orientation="Horizontal" spacing="0un" type="linear">
+ <contentsmargins bottom="0un" left="0un" right="0un" top="0un"/>
+ <linearitem itemname="powerButton"/>
+ <linearitem itemname="previousPushButton"/>
+ <linearitem itemname="nextPushButton"/>
+ </layout>
+ </widget>
+ <widget name="tunerStackedLayout" type="HbWidget">
+ <widget name="tunerInformationStackedLayout" type="HbWidget">
+ <widget name="lonelyRowLabel" type="HbLabel">
+ <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
+ <sizehint type="PREFERRED" width="expr(32un - 2 * var(hb-param-margin-gene-middle-horizontal) )"/>
+ <string name="toolTipText"/>
+ <string name="windowTitle"/>
+ <string name="textColor" value="#000000"/>
+ <string name="plainText"/>
+ <fontspec name="fontSpec" role="Primary" textheight="var(hb-param-text-height-secondary)"/>
+ </widget>
+ <widget name="twoRowsLayout" type="HbWidget">
+ <widget name="firstRowLabel" type="HbLabel">
+ <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
+ <real name="z" value="1"/>
+ <sizehint type="PREFERRED" width="expr(32un - 2 * var(hb-param-margin-gene-middle-horizontal) )"/>
+ <string locid="label for first row in two row layout" name="plainText"/>
+ <fontspec name="fontSpec" role="Primary" textheight="var(hb-param-text-height-secondary)"/>
+ </widget>
+ <widget name="secondRowLabel" type="HbLabel">
+ <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
+ <real name="z" value="2"/>
+ <sizehint type="PREFERRED" width="expr(32un - 2 * var(hb-param-margin-gene-middle-horizontal) )"/>
+ <string locid="label for second row in two row layout" name="plainText"/>
+ <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
+ </widget>
+ <real name="z" value="3"/>
+ <sizehint height="expr(10un - 2 * 1.5un )" type="PREFERRED" width="expr(32un - 2 * var(hb-param-margin-gene-middle-horizontal) )"/>
+ <layout orientation="Vertical" spacing="var(hb-param-margin-gene-middle-vertical)" type="linear">
+ <contentsmargins bottom="0un" left="0un" right="0un" top="0un"/>
+ <linearitem itemname="firstRowLabel"/>
+ <linearitem itemname="secondRowLabel"/>
+ </layout>
+ </widget>
+ <widget name="animationIcon" type="HbLabel">
+ <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
+ <sizehint height="var(hb-param-graphic-size-primary-medium)" type="PREFERRED" width="var(hb-param-graphic-size-primary-medium)"/>
+ </widget>
+ <real name="z" value="1"/>
+ <sizepolicy horizontalPolicy="Preferred" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
+ <sizehint height="7un" type="PREFERRED" width="30.5un"/>
+ <sizehint height="expr(10un - 2 * 1.5un)" type="MINIMUM" width="expr(32un - 4 * var(hb-param-margin-gene-middle-horizontal))"/>
+ <contentsmargins bottom="1.5un" left="var(hb-param-margin-gene-middle-horizontal)" right="var(hb-param-margin-gene-middle-horizontal)" top="1.5un"/>
+ <sizehint height="2504062.01158un" type="MAXIMUM" width="2504062.01158un"/>
+ <layout type="stacked">
+ <stackitem itemname="lonelyRowLabel"/>
+ <stackitem itemname="twoRowsLayout"/>
+ <stackitem itemname="animationIcon"/>
+ </layout>
+ </widget>
+ <widget name="tunerBackgroundPushButton" type="HbPushButton">
+ <sizehint height="10un" type="PREFERRED" width="32un"/>
+ <sizehint type="MINIMUM" width="32un"/>
+ <string name="text"/>
+ <string name="state" value="normal"/>
+ </widget>
+ <real name="z" value="3"/>
+ <sizehint height="10un" type="PREFERRED" width="32un"/>
+ <sizehint height="10un" type="MINIMUM" width="32un"/>
+ <contentsmargins bottom="0un" left="0un" right="0un" top="0un"/>
+ <layout type="stacked">
+ <stackitem itemname="tunerInformationStackedLayout"/>
+ <stackitem itemname="tunerBackgroundPushButton"/>
+ </layout>
+ </widget>
+ <real name="z" value="2"/>
+ <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
+ <sizehint height="26.5un" type="FIXED" width="37un"/>
+ <sizehint height="26.5un" type="MINIMUM"/>
+ <sizehint height="26.5un" type="MAXIMUM" width="37un"/>
+ <layout orientation="Vertical" spacing="0un" type="linear">
+ <contentsmargins bottom="2un" left="2.5un" right="2.5un" top="5.5un"/>
+ <linearitem itemname="tunerStackedLayout" spacing="var(hb-param-margin-gene-middle-vertical)"/>
+ <linearitem itemname="controlButtons" spacing="0un"/>
+ </layout>
+ </widget>
+ <widget name="background" type="HbLabel">
+ <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
+ <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
+ <sizehint height="26.5un" type="FIXED" width="37un"/>
+ <icon iconName="qtg_graf_hsradio_bg" name="icon"/>
+ </widget>
+ <real name="z" value="1"/>
+ <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
+ <sizehint height="26.5un" type="FIXED" width="37un"/>
+ <layout type="stacked">
+ <stackitem itemname="contentLayout"/>
+ <stackitem itemname="background"/>
+ </layout>
+ </widget>
+ <metadata activeUIState="Common ui state" display="NHD-3.2-inch_landscape" unit="un">
+ <uistate name="Common ui state" sections="#common"/>
+ </metadata>
+</hbdocument>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radiohswidget/resource/fmradiohswidget.manifest Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<hswidgetmanifest>
+ <uri>fmradiohswidget</uri>
+ <title>txt_fmradiohswidget_list_fm_radio_homescreen_widget</title>
+ <description>txt_fmradiohswidget_list_quick_access_for_fm_radio_in_your</description>
+ <icon>qtg_large_radio</icon>
+ <hidden>false</hidden>
+ <servicexml>fmradiohswidget.xml</servicexml>
+</hswidgetmanifest>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radiohswidget/resource/fmradiohswidget.xml Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<service>
+ <name>fmradiohswidget</name>
+ <filepath>fmradiohswidget</filepath>
+ <description>FM Radio homescreen widget</description>
+ <interface>
+ <name>com.nokia.symbian.IHomeScreenWidget</name>
+ <version>1.0</version>
+ <description>FM Radio homescreen widget</description>
+ <capabilities></capabilities>
+ </interface>
+</service>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radiohswidget/resources.qrc Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,5 @@
+<RCC>
+ <qresource prefix="/ui">
+ <file>resource/fmradiohswidget.docml</file>
+ </qresource>
+</RCC>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radiohswidget/rom/fmradiohswidget.iby Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,31 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+#ifndef __RADIOHSWIDGET_IBY__
+#define __RADIOHSWIDGET_IBY__
+
+// Use standard macros
+#include <data_caging_paths_for_iby.hrh>
+
+file=ABI_DIR\BUILD_DIR\fmradiohswidget.dll SHARED_LIB_DIR\fmradiohswidget.dll
+data=ZPRIVATE\20022f35\import\widgetregistry\2002E6D6\fmradiohswidget.qtplugin private\20022f35\import\widgetregistry\2002E6D6\fmradiohswidget.qtplugin
+data=ZPRIVATE\20022f35\import\widgetregistry\2002E6D6\fmradiohswidget.xml private\20022f35\import\widgetregistry\2002E6D6\fmradiohswidget.xml
+data=ZPRIVATE\20022f35\import\widgetregistry\2002E6D6\fmradiohswidget.manifest private\20022f35\import\widgetregistry\2002E6D6\fmradiohswidget.manifest
+
+data=\epoc32\data\z\system\install\fmradiohswidget_stub.sis system\install\fmradiohswidget_stub.sis
+
+#endif //__RADIOHSWIDGET_IBY__
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radiohswidget/rom/fmradiohswidget_resources.iby Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,30 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+* Iby file for FMRadio
+*
+*/
+
+
+#ifndef RADIOHSWIDGET_RESOURCES_IBY
+#define RADIOHSWIDGET_RESOURCES_IBY
+
+// Use standard macros
+#include <data_caging_paths_for_iby.hrh>
+
+#S60_APP_RESOURCE(fmradiohswidget)
+
+#data=DATAZ_\QT_TRANSLATIONS_DIR\fmradiohswidget.qm QT_TRANSLATIONS_DIR\fmradiohswidget.qm
+
+#endif // RADIOHSWIDGET_RESOURCES_IBY
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radiohswidget/rom/fmradiohswidget_stub.pkg Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,27 @@
+;
+; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description: Stub package file for FM Radio home screen widget
+;
+
+; Languages
+&EN
+
+; Header
+#{"fmradiohswidget"}, (0x2002E6D6), 1, 0, 0, TYPE=SA
+
+; Localised Vendor name
+%{"Nokia"}
+
+; Unique Vendor name
+:"Nokia"
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radiohswidget/sis/fmradiohswidget.bat Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,30 @@
+@rem
+@rem Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@echo off
+
+if exist fmradiohswidget.sisx del fmradiohswidget.sisx
+
+makesis fmradiohswidget.pkg
+signsis fmradiohswidget.sis fmradiohswidget.sisx ../../internal/sis/nokia_rndcert_02.der ../../internal/sis/nokia_rndcert_02.key
+
+if exist fmradiohswidget.sisx (
+echo fmradiohswidget.sisx creation SUCCEEDED
+del fmradiohswidget.sis
+)
+
+if not exist fmradiohswidget.sisx (
+echo fmradiohswidget.sisx creation FAILED
+)
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radiohswidget/sis/fmradiohswidget.pkg Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,55 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+; Language
+&EN
+
+; SIS header: name, uid, version
+#{"fmradiohswidget"}, (0x2002E6D6), 1, 0, 0, TYPE=SA, RU
+
+; Localised Vendor name
+%{"Vendor"}
+
+; Unique Vendor name
+:"Vendor"
+
+; Manual PKG pre-rules from PRO files
+; Default HW/platform dependencies
+[0x101F7961],0,0,0,{"S60ProductID"}
+[0x102032BE],0,0,0,{"S60ProductID"}
+[0x102752AE],0,0,0,{"S60ProductID"}
+[0x1028315F],0,0,0,{"S60ProductID"}
+
+"../resource/fmradiohswidget.manifest" - "!:/private/20022F35/import/widgetregistry/20022F7E/fmradiohswidget.manifest",FM,"application/hs-widget-uninstall+xml",RR,RW
+
+"/epoc32/release/armv5/urel/fmradiohswidget.dll" - "!:/sys/bin/fmradiohswidget.dll"
+"/epoc32/data/z/private/20022F35/import/widgetregistry/2002E6D6/fmradiohswidget.qtplugin" - "!:/private/20022F35/import/widgetregistry/2002E6D6/fmradiohswidget.qtplugin"
+"../resource/fmradiohswidget.manifest" - "!:/private/20022F35/import/widgetregistry/2002E6D6/radiohswidget.manifest"
+"../resource/fmradiohswidget.xml" - "!:/private/20022F35/import/widgetregistry/2002E6D6/radiohswidget.xml"
+;"/epoc32/data/z/private/20022F35/import/widgetregistry/2002E6D6/fmradiohswidget.png" - "!:/private/20022F35/import/widgetregistry/2002E6D6/radiohswidget.png"
+
+
+;"/epoc32/release/armv5/urel/fmradiohswidget.dll" - "!:/sys/bin/fmradiohswidget.dll"
+;"../radiohswidget/qmakepluginstubs/fmradiohswidget.qtplugin" - "!:/private/20022F35/import/widgetregistry/2002E6D6/fmradiohswidget.qtplugin"
+;"../radiohswidget/resource/fmradiohswidget.manifest" - "!:/private/20022F35/import/widgetregistry/2002E6D6/fmradiohswidget.manifest"
+;"../radiohswidget/resource/fmradiohswidget.s60xml" - "!:/private/20022F35/import/widgetregistry/2002E6D6/fmradiohswidget.xml"
+;"../radiohswidget/resource/fmradiohswidget.css" - "!:/private/20022F35/import/widgetregistry/2002E6D6/fmradiohswidget.css"
+;;"/epoc32/data/z/private/20022F35/import/widgetregistry/2002E6D6/fmradiohswidget.s60xml" - "!:/private/20022F35/import/widgetregistry/2002E6D6/fmradiohswidget.xml"
+;;"../radiohswidget/resource/fmradiohswidget.xml" - "!:/private/20022F35/import/widgetregistry/2002E6D6/fmradiohswidget.xml"
+;;"../radiohswidget/resource/fmradiohswidget_icon.png" - "!:/private/20022F35/import/widgetregistry/2002E6D6/fmradiohswidget_icon.png"
+
+;"/epoc32/data/z/resource/qt/translations/fmradiohswidget.qm" - "!:/resource/qt/translations/fmradiohswidget.qm"
+;"/epoc32/data/z/resource/qt/translations/fmradiohswidget_en_us.qm" - "!:/resource/qt/translations/fmradiohswidget_en_us.qm"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radiohswidget/src/radiohswidget.cpp Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,1097 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: FM Radio home screen widget
+*
+*/
+
+// System includes
+#include <HbPushButton>
+#include <HbLabel>
+#include <HbDocumentLoader>
+#include <HbFrameDrawer>
+#include <HbIcon>
+#include <HbIconAnimationManager>
+#include <HbIconAnimationDefinition>
+#include <HbColorScheme>
+#include <HbDeviceMessageBox>
+#include <QGraphicsLinearLayout>
+#include <QGraphicsItem>
+#include <QDesktopServices>
+#include <QSignalMapper>
+
+// User includes
+#include "radiohswidget.h"
+#include "radiohswidgetprofilereader.h"
+#include "radiohswidgetradioserviceclient.h"
+#include "radioservicedef.h"
+#include "radio_global.h"
+#include "radiologger.h"
+
+// Constants
+/** Path to docml file */
+const QString DOCML(":/ui/resource/fmradiohswidget.docml");
+
+/** DOCML object name for mainLayout */
+const QString DOCML_OBJECT_NAME_MAIN_LAYOUT("mainLayout");
+/** DOCML object name for contentLayout */
+const QString DOCML_OBJECT_NAME_CONTENT_LAYOUT("contentLayout");
+/** DOCML object name for tunerBackgroundPushButton */
+const QString DOCML_OBJECT_NAME_TUNER_BACKGROUND_BUTTON(
+ "tunerBackgroundPushButton");
+/** DOCML object name for tunerStackedLayout */
+const QString DOCML_OBJECT_NAME_TUNER_STACKED_LAYOUT("tunerStackedLayout");
+/** DOCML object name for tunerInformationStackedLayout */
+const QString DOCML_OBJECT_NAME_TUNER_INFORMATION_STACKED_LAYOUT(
+ "tunerInformationStackedLayout");
+/** DOCML object name for controlButtons */
+const QString DOCML_OBJECT_NAME_CONTROL_BUTTONS_LAYOUT("controlButtons");
+/** DOCML object name for powerToggleButton */
+const QString DOCML_OBJECT_NAME_POWER_BUTTON("powerButton");
+/** DOCML object name for previousPushButton */
+const QString DOCML_OBJECT_NAME_PREVIOUS_BUTTON("previousPushButton");
+/** DOCML object name for nextPushButton */
+const QString DOCML_OBJECT_NAME_NEXT_BUTTON("nextPushButton");
+/** DOCML object name for twoRowsLayout */
+const QString DOCML_OBJECT_NAME_TWO_ROWS_LAYOUT("twoRowsLayout");
+/** DOCML object name for firstRowLabel */
+const QString DOCML_OBJECT_NAME_FIRST_ROW_LABEL("firstRowLabel");
+/** DOCML object name for secondRowLabel */
+const QString DOCML_OBJECT_NAME_SECOND_ROW_LABEL("secondRowLabel");
+/** DOCML object name for lonelyRowLabel */
+const QString DOCML_OBJECT_NAME_LONELY_ROW_LABEL("lonelyRowLabel");
+/** DOCML object name for animationIcon */
+const QString DOCML_OBJECT_NAME_ANIMATION_ICON("animationIcon");
+
+/** Unknown favorite station count. */
+const int FAVORITE_STATION_COUNT_UNDEFINED(-1);
+/** One favorite station set. */
+const int FAVORITE_STATION_COUNT_ONE(1);
+/** Favorite station count lower boundary including this number. */
+const int FAVORITE_STATION_COUNT_LOWER_BOUNDARY(0);
+/** Favorite station count upper boundary including this number. */
+const int FAVORITE_STATION_COUNT_UPPER_BOUNDARY(100);
+
+// Graphics identifiers for different push button states
+const QString CONTROL_BUTTON_GRAPHICS_NORMAL ("qtg_fr_hsbutton_normal");
+const QString CONTROL_BUTTON_GRAPHICS_PRESSED ("qtg_fr_hsbutton_pressed");
+const QString CONTROL_BUTTON_GRAPHICS_DISABLED("qtg_fr_hsbutton_disabled");
+const QString CONTROL_BUTTON_GRAPHICS_LATCHED ("qtg_fr_hsbutton_latched");
+
+// Push button icon colors for each of the states (normal, pressed, disabled
+// and latched)
+const QString CONTROL_BUTTON_ICON_COLOR_NORMAL ("qtc_button_normal");
+const QString CONTROL_BUTTON_ICON_COLOR_PRESSED ("qtc_button_pressed");
+const QString CONTROL_BUTTON_ICON_COLOR_DISABLED("qtc_button_disabled");
+const QString CONTROL_BUTTON_ICON_COLOR_LATCHED ("qtc_button_latched");
+
+// File name suffix lists for push buttons
+const QStringList POWER_BUTTON_SUFFIX(
+ (QStringList() << "_l" << "_c" << "_cr"));
+const QStringList PREVIOUS_BUTTON_SUFFIX(
+ (QStringList() << "_cl" << "_c" << "_cr"));
+const QStringList NEXT_BUTTON_SUFFIX(
+ (QStringList() << "_cl" << "_c" << "_r"));
+
+/** Icon for power button off. */
+const QString POWER_BUTTON_ICON_OFF("qtg_mono_power");
+/** Icon for power button on. */
+const QString POWER_BUTTON_ICON_ON ("qtg_mono_power");
+
+// Tuner background button graphics for different states.
+const QString TUNER_BUTTON_NORMAL_OFF("qtg_fr_tuner");
+const QString TUNER_BUTTON_NORMAL_ON("qtg_fr_tuner");
+const QString TUNER_BUTTON_NORMAL_PRESSED("qtg_fr_hsitems2_pressed");
+
+/*!
+ \class RadioHsWidget
+ \brief Implementation of FM Radio home screen widget.
+
+ RadioHsWidget implements needed functions for the FM Radio home screen
+ widget.
+*/
+
+// ======== MEMBER FUNCTIONS ========
+
+/*!
+ Constructs a widget which is a child of \a parent, with widget flags set
+ to \a flags.
+
+ Constructor should be empty and all the actual construction should be
+ done in onInitialize().
+ */
+RadioHsWidget::RadioHsWidget(QGraphicsItem* parent, Qt::WindowFlags flags)
+ : HbWidget(parent, flags),
+ mInformationAreaBackgroundButton(NULL),
+ mPowerButton(NULL),
+ mPreviousButton(NULL),
+ mNextButton(NULL),
+ mInformationAreaTwoRowsLayout(NULL),
+ mInformationLonelyRowLabel(NULL),
+ mInformationFirstRowLabel(NULL),
+ mInformationSecondRowLabel(NULL),
+ mAnimationIcon(NULL),
+ mFmRadioState(FmRadio::StateUndefined),
+ mFavoriteStationCount(FAVORITE_STATION_COUNT_UNDEFINED),
+ mCurrentStationIsFavorite(false),
+ mProfileMonitor(NULL),
+ mRadioServiceClient(NULL)
+{
+ LOG_METHOD;
+}
+
+/*!
+ Destructor
+ */
+RadioHsWidget::~RadioHsWidget()
+{
+ LOG_METHOD;
+}
+
+/*!
+ Handles changes in FM Radio information.
+
+ \param informationType Type of changed information.
+ \param information Actual information.
+ */
+void RadioHsWidget::handleRadioInformationChange(const int informationType,
+ const QVariant &information)
+{
+ LOG_METHOD;
+ switch (informationType) {
+
+ case RadioServiceNotification::FavoriteCount:
+ LOG("FavoriteCount");
+ if (information.canConvert(QVariant::Int) &&
+ information.toInt() >= FAVORITE_STATION_COUNT_LOWER_BOUNDARY &&
+ information.toInt() <= FAVORITE_STATION_COUNT_UPPER_BOUNDARY) {
+ mFavoriteStationCount = information.toInt();
+ // If there are favorite stations, enable the next/previous
+ // buttons.
+ LOG_FORMAT("mFavoriteStationCount: %d", mFavoriteStationCount);
+ // Enable or disable buttons only if favoriteCount differs
+ // from 1. CurrentIsFavorite case handles situation when there
+ // is only one favorite station.
+ if (mFavoriteStationCount != FAVORITE_STATION_COUNT_ONE) {
+ enableStationButtons();
+ }
+ } else {
+ mFavoriteStationCount = FAVORITE_STATION_COUNT_UNDEFINED;
+ }
+ break;
+
+ case RadioServiceNotification::CurrentIsFavorite:
+ LOG("CurrentIsFavorite");
+ if (information.canConvert(QVariant::Bool)) {
+ mCurrentStationIsFavorite = information.toBool();
+ LOG_FORMAT("currentIsFavorite: %d", mCurrentStationIsFavorite);
+ // If current station is favorite disable next/prev buttons.
+ // Radio sends this information only when there is only one
+ // favorite station set.
+ enableStationButtons();
+ }
+ break;
+
+ case RadioServiceNotification::RadioStatus:
+ LOG("RadioStatus");
+ if (information.canConvert(QVariant::Int)) {
+ const int status = information.toInt();
+ switch (status) {
+ case RadioStatus::Playing:
+ LOG("Playing");
+ break;
+ case RadioStatus::Muted:
+ LOG("Muted");
+ break;
+ case RadioStatus::Seeking:
+ LEVEL2(LOG("Seeking"));
+ handleRadioStateChange(FmRadio::StateSeeking);
+ break;
+ case RadioStatus::NoAntenna:
+ LEVEL2(LOG("NoAntenna"));
+ handleRadioStateChange(FmRadio::StateAntennaNotConnected);
+ break;
+ case RadioStatus::PoweringOff:
+ LEVEL2(LOG("PoweringOff"));
+ handleRadioStateChange(FmRadio::StateClosing);
+ break;
+ default:
+ LOG("default case at case RadioStatus");
+ break;
+ }
+ }
+ break;
+
+ case RadioServiceNotification::Frequency:
+ LOG("Frequency");
+ // TODO: Should information.toString() be checked for too many characters? What's the limit?
+ if (information.canConvert(QVariant::String)) {
+ LOG_FORMAT("frequency: %s", GETSTRING(information.toString()));
+ // TODO: Remove comment when localisation is working on device.
+ //frequencyString = hbTrId("txt_fmradiohswidget_rad_list_l1_mhz").arg(freqString);
+ bool frequencyCleared = false;
+ // If widget has some frequency information and new frequency
+ // differs from that
+ if (mRadioInformation.contains(Frequency)
+ && mRadioInformation[Frequency].compare(information.toString()) != 0) {
+ // Clear all infromation from widget because station has changed.
+ clearRadioInformation();
+ frequencyCleared = true;
+ }
+ // If widget do not have any frquency information, update it.
+ bool frequencyUpdated = updateRadioInformation(Frequency,
+ information.toString());
+ if (frequencyCleared || frequencyUpdated) {
+ // Information changed, update the UI.
+ changeInRadioInformation();
+ }
+ }
+ break;
+
+ case RadioServiceNotification::Name:
+ LOG("Name");
+ handleSimilarRadioInformation(StationName, information);
+ break;
+
+ case RadioServiceNotification::Genre:
+ LOG("Genre");
+ handleSimilarRadioInformation(Pty, information);
+ break;
+
+ case RadioServiceNotification::RadioText:
+ LOG("RadioText");
+ handleSimilarRadioInformation(RadioText, information);
+ break;
+
+ case RadioServiceNotification::DynamicPS:
+ LOG("DynamicPS");
+ handleSimilarRadioInformation(DynamicPsName, information);
+ break;
+
+ default:
+ LOG("default case at notificationId");
+ break;
+ }
+}
+
+/*!
+ Handles changes in FM Radio state.
+
+ \param value New state of the radio application.
+*/
+void RadioHsWidget::handleRadioStateChange(const QVariant &value)
+{
+ LOG_METHOD;
+ int state;
+ if (value.canConvert(QVariant::Int)) {
+ state = value.toInt();
+ } else {
+ return;
+ }
+
+ if (state == mFmRadioState) {
+ // State did not change, so return.
+ return;
+ }
+
+ switch (state) {
+ case FmRadio::StateUndefined:
+ LOG("FmRadio::StateUndefined");
+ // Something went wrong. Widget should not be in this state after onInitialize().
+ mFmRadioState = FmRadio::StateUndefined;
+ break;
+ case FmRadio::StateNotRunning:
+ LOG("FmRadio::StateNotRunning");
+ mFmRadioState = FmRadio::StateNotRunning;
+ mRadioServiceClient->stopMonitoring();
+ changePowerButtonOn(false);
+ mFavoriteStationCount = FAVORITE_STATION_COUNT_UNDEFINED;
+ mCurrentStationIsFavorite = false;
+ enableStationButtons();
+ clearRadioInformation();
+ mInformationFirstRowLabel->setPlainText("");
+ mInformationSecondRowLabel->setPlainText("");
+ mInformationLonelyRowLabel->setPlainText(hbTrId("txt_fmradiohswidget_rad_list_fm_radio"));
+ changeInformationAreaLayout(OneRow);
+ break;
+ case FmRadio::StateStarting:
+ LOG("FmRadio::StateStarting");
+ mFmRadioState = FmRadio::StateStarting;
+ changePowerButtonOn(true);
+ mFavoriteStationCount = FAVORITE_STATION_COUNT_UNDEFINED;
+ mCurrentStationIsFavorite = false;
+ enableStationButtons();
+ changeInformationAreaLayout(Animation);
+ break;
+ case FmRadio::StateRunning:
+ LOG("FmRadio::StateRunning");
+ mFmRadioState = FmRadio::StateRunning;
+ // Stop timer if it is running because radio is now running.
+ mRadioServiceClient->startMonitoring(
+ FmRadio::VisibiltyDoNotChange);
+ changePowerButtonOn(true);
+ enableStationButtons();
+ changeInformationAreaLayout(OneRow);
+ break;
+ case FmRadio::StateSeeking:
+ LOG("FmRadio::StateSeeking");
+ mFmRadioState = FmRadio::StateSeeking;
+ mFavoriteStationCount = FAVORITE_STATION_COUNT_UNDEFINED;
+ mCurrentStationIsFavorite = false;
+ enableStationButtons();
+ changeInformationAreaLayout(Animation);
+ break;
+ case FmRadio::StateAntennaNotConnected:
+ LOG("FmRadio::StateAntennaNotConnected");
+ mFmRadioState = FmRadio::StateAntennaNotConnected;
+ mFavoriteStationCount = FAVORITE_STATION_COUNT_UNDEFINED;
+ mCurrentStationIsFavorite = false;
+ enableStationButtons();
+ mInformationFirstRowLabel->setPlainText("");
+ mInformationSecondRowLabel->setPlainText("");
+ mInformationLonelyRowLabel->setPlainText(hbTrId(
+ "txt_fmradiohswidget_rad_info_connect_wired_headset"));
+ changeInformationAreaLayout(OneRow);
+ break;
+ case FmRadio::StateClosing:
+ LOG("FmRadio::StateClosing");
+ mFmRadioState = FmRadio::StateClosing;
+ changePowerButtonOn(false);
+ mFavoriteStationCount = FAVORITE_STATION_COUNT_UNDEFINED;
+ mCurrentStationIsFavorite = false;
+ enableStationButtons();
+ clearRadioInformation();
+ mInformationFirstRowLabel->setPlainText("");
+ mInformationSecondRowLabel->setPlainText("");
+ mInformationLonelyRowLabel->setPlainText(hbTrId(
+ "txt_fmradiohswidget_rad_list_fm_radio"));
+ changeInformationAreaLayout(OneRow);
+ break;
+ default:
+ LOG_FORMAT("default case at state. State: %d", state);
+ break;
+ }
+}
+
+/*!
+ Called when widget is initialized. Constructs objects and connects them.
+*/
+void RadioHsWidget::onInitialize()
+{
+ LOG_METHOD_ENTER;
+ mProfileMonitor = new RadioHsWidgetProfileReader(this);
+ mRadioServiceClient = new RadioHsWidgetRadioServiceClient(this);
+
+ load(DOCML);
+
+ // Use signal mapper to indicate button identifiers to button event
+ // slots.
+ QSignalMapper* signalMapperPressed = new QSignalMapper(this);
+ signalMapperPressed->setMapping(mPowerButton, Power);
+ signalMapperPressed->setMapping(mPreviousButton, Previous);
+ signalMapperPressed->setMapping(mNextButton, Next);
+
+ // Need to use different signal mapper for pressed and released events,
+ // both have same mappings but they are mapped to different slots.
+ QSignalMapper* signalMapperReleased = new QSignalMapper(this);
+ signalMapperReleased->setMapping(mPowerButton, Power);
+ signalMapperReleased->setMapping(mPreviousButton, Previous);
+ signalMapperReleased->setMapping(mNextButton, Next);
+
+ // Connect button events to signal maps.
+ Radio::connect(mPowerButton, SIGNAL(pressed()), signalMapperPressed, SLOT (map()));
+ Radio::connect(mPowerButton, SIGNAL(released()), signalMapperReleased, SLOT (map()));
+ Radio::connect(mPreviousButton, SIGNAL(pressed()), signalMapperPressed, SLOT (map()));
+ Radio::connect(mPreviousButton, SIGNAL(released()), signalMapperReleased, SLOT (map()));
+ Radio::connect(mNextButton, SIGNAL(pressed()), signalMapperPressed, SLOT (map()));
+ Radio::connect(mNextButton, SIGNAL(released()), signalMapperReleased, SLOT (map()));
+
+ // Connect mapper signals to self implemented slots.
+ Radio::connect(signalMapperPressed, SIGNAL(mapped(int)), this, SLOT(changeButtonToPressed(int)));
+ Radio::connect(signalMapperReleased, SIGNAL(mapped(int)), this, SLOT(changeButtonToReleased(int)));
+
+ mProfileMonitor->startMonitoringRadioRunningStatus();
+}
+
+/*!
+ Called when widget is shown in the home screen
+*/
+void RadioHsWidget::onShow()
+{
+ LOG_METHOD_ENTER;
+}
+
+/*!
+ Called when widget is hidden from the home screen
+*/
+void RadioHsWidget::onHide()
+{
+ LOG_METHOD_ENTER;
+}
+
+/*!
+ Emited from HbPushButton:pressed() signal, changes the button layout to
+ pressed state.
+
+ \param hsButtonIdentifier Identifies the button which was pressed.
+ */
+void RadioHsWidget::changeButtonToPressed(int hsButtonIdentifier)
+{
+ LEVEL2(LOG_METHOD);
+ buttonEvent(static_cast<ControlButtonIdentifier>(hsButtonIdentifier), Pressed);
+}
+
+/*!
+ Emited from HbPushButton:released() signal, changes the button layout to
+ normal state.
+
+ \param hsButtonIdentifier Identifies the button which was released.
+ */
+void RadioHsWidget::changeButtonToReleased(int hsButtonIdentifier)
+{
+ LEVEL2(LOG_METHOD);
+ buttonEvent(static_cast<ControlButtonIdentifier>(hsButtonIdentifier), Normal);
+}
+
+/*!
+ Slot for closing FM Radio application from power button.
+ */
+void RadioHsWidget::closeRadio()
+{
+ LOG_SLOT_CALLER;
+ mRadioServiceClient->commandFmRadio(RadioServiceCommand::PowerOff);
+}
+
+/*!
+ Slot for previous button clicked.
+ */
+void RadioHsWidget::changeToPreviousStation()
+{
+ LOG_SLOT_CALLER;
+ clearRadioInformation();
+ mRadioServiceClient->commandFmRadio(RadioServiceCommand::Previous);
+}
+
+/*!
+ Slot for next button clicked.
+ */
+void RadioHsWidget::changeToNextStation()
+{
+ LOG_SLOT_CALLER;
+ clearRadioInformation();
+ mRadioServiceClient->commandFmRadio(RadioServiceCommand::Next);
+
+}
+
+/*!
+ Slot for bringing the radio application to foreground.
+ */
+void RadioHsWidget::changeRadioToForeground()
+{
+ LOG_SLOT_CALLER;
+ // If radio is not running start it to foreground by monitor request.
+ if (mFmRadioState == FmRadio::StateNotRunning) {
+ bool okToStartRadio = radioStartPermission();
+ if (okToStartRadio) {
+ handleRadioStateChange(FmRadio::StateStarting);
+ mRadioServiceClient->startMonitoring(
+ FmRadio::VisibiltyToForeground);
+ }
+ }
+ else {
+ if (mFmRadioState == FmRadio::StateClosing) {
+ // Radio is closing but user wants to power it up again.
+ mRadioServiceClient->commandFmRadio(RadioServiceCommand::PowerOn);
+ // Stop and start monitoring to get refresh.
+ mRadioServiceClient->stopMonitoring();
+ mRadioServiceClient->startMonitoring(
+ FmRadio::VisibiltyToBackground);
+ handleRadioStateChange(FmRadio::StateRunning);
+ }
+ // If radio is running, bring it to the foreground.
+ mRadioServiceClient->commandFmRadio(RadioServiceCommand::Foreground);
+ }
+}
+
+/*!
+ Slot for putting the radio application to the background.
+ */
+void RadioHsWidget::changeRadioToBackground()
+{
+ LOG_SLOT_CALLER;
+ // If radio is not running start it to background by monitor request.
+ if (mFmRadioState == FmRadio::StateNotRunning) {
+ bool okToStartRadio = radioStartPermission();
+ if (okToStartRadio) {
+ handleRadioStateChange(FmRadio::StateStarting);
+ mRadioServiceClient->startMonitoring(
+ FmRadio::VisibiltyToBackground);
+ }
+ }
+ else if (mFmRadioState == FmRadio::StateStarting) {
+ // Do nothing if radio is starting.
+ }
+ else if (mFmRadioState == FmRadio::StateClosing) {
+ // Radio is closing but user wants to power it up again.
+ mRadioServiceClient->commandFmRadio(RadioServiceCommand::PowerOn);
+ // Stop and start monitoring to get refresh.
+ mRadioServiceClient->stopMonitoring();
+ mRadioServiceClient->startMonitoring(
+ FmRadio::VisibiltyToBackground);
+ handleRadioStateChange(FmRadio::StateRunning);
+ }
+ else {
+ // If radio is running, put it to the background.
+ // This is little bit useless because the radio is in background if
+ // user is able to click the widget.
+ mRadioServiceClient->commandFmRadio(RadioServiceCommand::Background);
+ }
+}
+
+/*!
+ Powering off or on the radio.
+ */
+void RadioHsWidget::toggleRadioPower()
+{
+ LOG_SLOT_CALLER;
+ // If radio is not running start it to background by monitor request.
+ if (mFmRadioState == FmRadio::StateNotRunning || mFmRadioState == FmRadio::StateClosing) {
+ LEVEL2(LOG("Power on"));
+ // Start radio
+ changeRadioToBackground();
+ } else {
+ LEVEL2(LOG("Power off"));
+ // Close radio
+ closeRadio();
+ }
+}
+
+/*!
+ Loads docml file.
+
+ \param docml Docml filename to be loaded.
+ */
+void RadioHsWidget::load(const QString &docml)
+{
+ LOG_METHOD_ENTER;
+
+ QScopedPointer<HbDocumentLoader> documentLoader(new HbDocumentLoader());
+ bool loaded = false;
+ documentLoader->load(docml, &loaded);
+ if (loaded) {
+ // Find mainLayout
+ HbWidget *mainLayout = qobject_cast<HbWidget*> (
+ documentLoader->findWidget(DOCML_OBJECT_NAME_MAIN_LAYOUT));
+
+ if (mainLayout) {
+ QGraphicsLinearLayout *widgetLayout = new QGraphicsLinearLayout(
+ Qt::Vertical, this);
+ widgetLayout->addItem(mainLayout);
+ setLayout(widgetLayout);
+ }
+
+ // Find contentLayout
+ HbWidget *contentLayout = qobject_cast<HbWidget*> (
+ documentLoader->findWidget(DOCML_OBJECT_NAME_CONTENT_LAYOUT));
+ if (contentLayout) {
+
+ // Find stacked layout for tuner area.
+ HbWidget *tunerStackedLayout = qobject_cast<HbWidget*> (
+ documentLoader->findWidget(
+ DOCML_OBJECT_NAME_TUNER_STACKED_LAYOUT));
+ if (tunerStackedLayout) {
+
+ // Find stacked layout for information area.
+ HbWidget *tunerInformationStackedLayout = qobject_cast<
+ HbWidget*> (documentLoader->findWidget(
+ DOCML_OBJECT_NAME_TUNER_INFORMATION_STACKED_LAYOUT));
+ if (tunerInformationStackedLayout) {
+ }
+
+ // Find lonely label
+ mInformationLonelyRowLabel = qobject_cast<HbLabel *> (
+ documentLoader->findWidget(
+ DOCML_OBJECT_NAME_LONELY_ROW_LABEL));
+ if (mInformationLonelyRowLabel) {
+ // TODO: Set the color in docml when application designer supports it.
+ QColor color = HbColorScheme::color(
+ "qtc_radio_tuner_normal");
+ mInformationLonelyRowLabel->setTextColor(color);
+ }
+
+ // Find layout for two rows
+ mInformationAreaTwoRowsLayout = qobject_cast<
+ QGraphicsWidget *> (documentLoader->findObject(
+ DOCML_OBJECT_NAME_TWO_ROWS_LAYOUT));
+ if (mInformationAreaTwoRowsLayout) {
+ // Find first row
+ mInformationFirstRowLabel = qobject_cast<HbLabel *> (
+ documentLoader->findWidget(
+ DOCML_OBJECT_NAME_FIRST_ROW_LABEL));
+ if (mInformationFirstRowLabel) {
+ // TODO: Set the color in docml when application designer supports it.
+ QColor color = HbColorScheme::color(
+ "qtc_radio_tuner_normal");
+ mInformationFirstRowLabel->setTextColor(color);
+ }
+
+ // Find second row
+ mInformationSecondRowLabel = qobject_cast<HbLabel *> (
+ documentLoader->findWidget(
+ DOCML_OBJECT_NAME_SECOND_ROW_LABEL));
+ if (mInformationSecondRowLabel) {
+ // TODO: Set the color in docml when application designer supports it.
+ QColor color = HbColorScheme::color(
+ "qtc_radio_tuner_normal");
+ mInformationSecondRowLabel->setTextColor(color);
+ }
+ }
+
+ mAnimationIcon = qobject_cast<HbLabel *> (
+ documentLoader->findWidget(
+ DOCML_OBJECT_NAME_ANIMATION_ICON));
+ if (mAnimationIcon) {
+ // Use animation manager to access anim loading animation.
+ HbIconAnimationManager *animationManager =
+ HbIconAnimationManager::global();
+ // TODO: Axml extension can be removed after wk24 release.
+ animationManager->addDefinitionFile(QLatin1String(
+ "qtg_anim_loading.axml"));
+ mAnimationIcon->setIcon(HbIcon("qtg_anim_loading"));
+ }
+ }
+
+ // Find push button for tuner area.
+ mInformationAreaBackgroundButton = qobject_cast<HbPushButton*> (
+ documentLoader->findWidget(
+ DOCML_OBJECT_NAME_TUNER_BACKGROUND_BUTTON));
+ if (mInformationAreaBackgroundButton) {
+ // Use the frame background.
+ HbFrameDrawer *tunerBackgroundButtonFrameDrawer =
+ new HbFrameDrawer("qtg_fr_tuner",
+ HbFrameDrawer::ThreePiecesHorizontal);
+ tunerBackgroundButtonFrameDrawer->setFillWholeRect(true);
+ mInformationAreaBackgroundButton->setFrameBackground(
+ tunerBackgroundButtonFrameDrawer);
+ // Connect the button's clicked signal.
+ Radio::connect(mInformationAreaBackgroundButton,
+ SIGNAL(clicked()), this, SLOT(changeRadioToForeground()));
+ }
+
+ // Find layout for control buttons.
+ HbWidget *controlButtonsLayout = qobject_cast<HbWidget*> (
+ documentLoader->findWidget(
+ DOCML_OBJECT_NAME_CONTROL_BUTTONS_LAYOUT));
+ if (controlButtonsLayout) {
+
+ // Find power button.
+ mPowerButton
+ = qobject_cast<HbPushButton *> (
+ documentLoader->findWidget(
+ DOCML_OBJECT_NAME_POWER_BUTTON));
+ if (mPowerButton) {
+ defineButton(*mPowerButton,
+ CONTROL_BUTTON_GRAPHICS_NORMAL, POWER_BUTTON_SUFFIX,
+ POWER_BUTTON_ICON_ON,
+ CONTROL_BUTTON_ICON_COLOR_NORMAL);
+ // Connect the button's clicked signal.
+ Radio::connect(mPowerButton, SIGNAL(clicked()), this,
+ SLOT(toggleRadioPower()));
+ }
+
+ // Find previous button.
+ mPreviousButton = qobject_cast<HbPushButton *> (
+ documentLoader->findWidget(
+ DOCML_OBJECT_NAME_PREVIOUS_BUTTON));
+ if (mPreviousButton) {
+ defineButton(*mPreviousButton,
+ CONTROL_BUTTON_GRAPHICS_DISABLED,
+ PREVIOUS_BUTTON_SUFFIX, NULL,
+ CONTROL_BUTTON_ICON_COLOR_DISABLED);
+ // Connect the button's clicked signal.
+ Radio::connect(mPreviousButton, SIGNAL(clicked()), this,
+ SLOT(changeToPreviousStation()));
+ }
+
+ // Find next button.
+ mNextButton
+ = qobject_cast<HbPushButton *> (
+ documentLoader->findWidget(
+ DOCML_OBJECT_NAME_NEXT_BUTTON));
+ if (mNextButton) {
+ defineButton(*mNextButton,
+ CONTROL_BUTTON_GRAPHICS_DISABLED, NEXT_BUTTON_SUFFIX,
+ NULL, CONTROL_BUTTON_ICON_COLOR_DISABLED);
+ // Connect the button's clicked signal.
+ Radio::connect(mNextButton, SIGNAL(clicked()), this,
+ SLOT(changeToNextStation()));
+ }
+ }
+ }
+ }
+ else {
+ // Docml was not succesfully loaded. UI cannot be displayed.
+ // Emit error to home screen framework, which removes the widget.
+ emit error();
+ }
+}
+
+/*!
+ Groups handling of similar kind of radio information (textual) to one
+ function.
+
+ \param informationType Type of changed information.
+ \param information Actual textual information.
+ */
+void RadioHsWidget::handleSimilarRadioInformation(
+ const FmRadioInformationType informationType, const QVariant &information)
+{
+ LOG_METHOD_ENTER;
+ // TODO: Should information.toString() be checked for too many characters? What's the limit?
+ if (information.canConvert(QVariant::String) && updateRadioInformation(
+ informationType, information.toString())) {
+ LOG_FORMAT("informationType: %d, information: %s", informationType, GETSTRING(information.toString()));
+ changeInRadioInformation();
+ }
+}
+
+/*!
+ Check if the the radio information is changed. If it is changed, it is
+ also updated.
+
+ \param informationType Type of the information.
+ \param information Information text.
+
+ \returns Returns \c true, if information is updated. Returns \c false otherwise.
+ */
+bool RadioHsWidget::updateRadioInformation(const FmRadioInformationType informationType,
+ const QString &information)
+{
+ LOG_METHOD_RET("%d");
+ // If hash contains this type of information.
+ if (mRadioInformation.contains(informationType)) {
+ // If new information is empty.
+ if (information.isEmpty()) {
+ // Remove old information from the hash.
+ LEVEL2(LOG_FORMAT("informationType: %s removed", GETSTRING(informationType)));
+ mRadioInformation.remove(informationType);
+ // Return true to indicate the change.
+ return true;
+ }
+ // If new information differs from the old one.
+ if (mRadioInformation[informationType].compare(information) != 0) {
+ // Update the information.
+ LEVEL2(LOG_FORMAT("informationType: %s = %s", GETSTRING(informationType), GETSTRING(information)));
+ mRadioInformation[informationType] = information;
+ // And return true to indicate the change.
+ return true;
+ }
+ } else { // Hash do not contain this type of information.
+ // If new information is not empty.
+ if (!information.isEmpty()) {
+ // Add it to the hash.
+ LEVEL2(LOG_FORMAT("informationType: %s = %s", GETSTRING(informationType), GETSTRING(information)));
+ mRadioInformation[informationType] = information;
+ // Return true to indicate the change.
+ return true;
+ }
+ }
+ // Return false to indicate that nothing changed.
+ return false;
+}
+
+/*!
+ Formatting radio information texts after a change.
+ */
+void RadioHsWidget::changeInRadioInformation()
+{
+ LOG_METHOD_ENTER;
+ // Clear the rows.
+ mRadioInformationFirstRow.clear();
+ mRadioInformationSecondRow.clear();
+
+ // First row contains station name.
+ if (mRadioInformation.contains(StationName)) {
+ mRadioInformationFirstRow.append(mRadioInformation.value(StationName));
+ }
+ else if (mRadioInformation.contains(Frequency)) {
+ // Or frequency.
+ mRadioInformationFirstRow.append(mRadioInformation.value(Frequency));
+ } LEVEL2(LOG_FORMAT("mRadioInformationFirstRow: %s", GETSTRING(mRadioInformationFirstRow)));
+
+ // Second row of information contains radio text.
+ if (mRadioInformation.contains(RadioText)) {
+ mRadioInformationSecondRow.append(mRadioInformation.value(RadioText));
+ }
+ else if (mRadioInformation.contains(DynamicPsName)) {
+ // Or Dynamic PS name.
+ mRadioInformationSecondRow.append(mRadioInformation.value(DynamicPsName));
+ }
+ else if (mRadioInformation.contains(Pty)) {
+ // Or PTY.
+ mRadioInformationSecondRow.append(mRadioInformation.value(Pty));
+ }
+ LEVEL2(LOG_FORMAT("mRadioInformationSecondRow: %s", GETSTRING(mRadioInformationSecondRow)));
+
+ // If second row is empty.
+ if (mRadioInformationSecondRow.isEmpty()) {
+ // Show only the lonely row.
+ mInformationLonelyRowLabel->setPlainText(mRadioInformationFirstRow);
+ changeInformationAreaLayout(OneRow);
+ }
+ else {
+ // Else display both rows.
+ mInformationFirstRowLabel->setPlainText(mRadioInformationFirstRow);
+ mInformationSecondRowLabel->setPlainText(mRadioInformationSecondRow);
+ changeInformationAreaLayout(TwoRows);
+ }
+}
+
+/*!
+ Clears the radio station information. For example, when the station is
+ changed, old information should be cleared.
+ */
+void RadioHsWidget::clearRadioInformation()
+{
+ LOG_METHOD_ENTER;
+ mRadioInformation.clear();
+}
+
+/*!
+ Changes visible widgets of information area stacked layout.
+
+ \param layout The layout to switch visible.
+ */
+void RadioHsWidget::changeInformationAreaLayout(const InformationAreaLayout layout)
+{
+ LOG_METHOD_ENTER;
+ mInformationLonelyRowLabel->setVisible(layout == OneRow);
+ mInformationAreaTwoRowsLayout->setVisible(layout == TwoRows);
+ mAnimationIcon->setVisible(layout == Animation);
+}
+
+/*!
+ Changes state of power button.
+
+ \param isPowerOn \c true the power is on and \c false the power is off.
+ */
+void RadioHsWidget::changePowerButtonOn(const bool isPowerOn)
+{
+ LEVEL2(LOG_METHOD);
+ if (isPowerOn) {
+ LEVEL2(LOG("Power on"));
+ // TODO: Temporarily set the text to clarify the action it performs.
+ // Remove when graphics displays the difference.
+ mPowerButton->setText("Off");
+ buttonEvent(Power, Latched);
+ } else {
+ LEVEL2(LOG("Power off"));
+ // TODO: Temporarily set the text to clarify the action it performs.
+ // Remove when graphics displays the difference.
+ mPowerButton->setText("On");
+ buttonEvent(Power, Normal);
+ }
+}
+
+/*!
+ Changes enabled state of station buttons.
+ */
+void RadioHsWidget::enableStationButtons()
+{
+ LEVEL2(LOG_METHOD_ENTER);
+ if ((mFavoriteStationCount > 1) || (mFavoriteStationCount == 1
+ && !mCurrentStationIsFavorite)) {
+ changeButtonToEnabled(Next);
+ changeButtonToEnabled(Previous);
+ }
+ else if ((mFavoriteStationCount == 1 && mCurrentStationIsFavorite)
+ || (mFavoriteStationCount < 1)) {
+ changeButtonToDisabled(Next);
+ changeButtonToDisabled(Previous);
+ }
+}
+
+/*!
+ Makes homescreen specific push button based on parameters.
+
+ \param target Target push button to modify. Must not be NULL.
+ \param graphicsId Defines the target button background graphics.
+ \param suffix Defines the suffix for the target button background graphics.
+ \param icon Defines the icon for the target button.
+ \param iconColor Defines the icon color for the target button.
+ */
+void RadioHsWidget::defineButton(HbPushButton &target, const QString &graphicsId,
+ const QStringList &suffix, const QString &icon, const QString &iconColor)
+{
+ LEVEL2(LOG_METHOD);
+ HbFrameDrawer* drawer = NULL;
+
+ // First check if the drawer is already created for this push button
+ if (!target.frameBackground()) {
+ LEVEL2(LOG("Creating new frame background."));
+ // Nope, create one now
+ drawer = new HbFrameDrawer(graphicsId,
+ HbFrameDrawer::ThreePiecesHorizontal);
+ target.setFrameBackground(drawer);
+ }
+ else {
+ // Frame drawer already created, only need to update frame graphics
+ drawer = target.frameBackground();
+ drawer->setFrameGraphicsName(graphicsId);
+ }
+
+ // Set file name suffix list, so that drawer can load correct 3-piece graphic files
+ drawer->setFileNameSuffixList(suffix);
+
+ // Set the icon, if it is not NULL
+ if (!icon.isNull()) {
+ target.setIcon(HbIcon(icon));
+ }
+
+ // Update also the icon color
+ QColor color = HbColorScheme::color(iconColor);
+ target.icon().setColor(color);
+
+ // Lastly, check if the buttton is disabled
+ if (iconColor == CONTROL_BUTTON_ICON_COLOR_DISABLED) {
+ target.setEnabled(false);
+ }
+ else {
+ target.setEnabled(true);
+ }
+}
+
+/*!
+ Prepares the information needed for displaying the button correctly
+ reflecting its state.
+
+ \param buttonId Identifies the button.
+ \param state Tells in what state the button is.
+ */
+void RadioHsWidget::buttonEvent(ControlButtonIdentifier buttonId,
+ const ControlButtonState state)
+{
+ LEVEL2(LOG_METHOD);
+ HbPushButton* target = NULL;
+ QStringList suffix;
+ QString icon;
+
+ switch (buttonId) {
+ case Power:
+ LEVEL2(LOG("Power"));
+ target = mPowerButton;
+ icon = POWER_BUTTON_ICON_ON;
+ suffix = POWER_BUTTON_SUFFIX;
+ break;
+ case Previous:
+ LEVEL2(LOG("Previous"));
+ target = mPreviousButton;
+ suffix = PREVIOUS_BUTTON_SUFFIX;
+ break;
+ case Next:
+ LEVEL2(LOG("Next"));
+ target = mNextButton;
+ suffix = NEXT_BUTTON_SUFFIX;
+ break;
+ default:
+ LOG("default case at buttonId");
+ break;
+ }
+
+ QString buttonBackgroundGraphics;
+ QString buttonIconColors;
+ switch (state) {
+ case Normal:
+ LEVEL2(LOG("Normal"));
+ target->setProperty("state", "normal");
+ buttonBackgroundGraphics = CONTROL_BUTTON_GRAPHICS_NORMAL;
+ buttonIconColors = CONTROL_BUTTON_ICON_COLOR_NORMAL;
+ break;
+ case Pressed:
+ LEVEL2(LOG("Pressed"));
+ target->setProperty("state", "pressed");
+ buttonBackgroundGraphics = CONTROL_BUTTON_GRAPHICS_PRESSED;
+ buttonIconColors = CONTROL_BUTTON_ICON_COLOR_PRESSED;
+ break;
+ case Disabled:
+ LEVEL2(LOG("Disabled"));
+ target->setProperty("state", "disabled");
+ buttonBackgroundGraphics = CONTROL_BUTTON_GRAPHICS_DISABLED;
+ buttonIconColors = CONTROL_BUTTON_ICON_COLOR_DISABLED;
+ break;
+ case Latched:
+ LEVEL2(LOG("Latched"));
+ target->setProperty("state", "latched");
+ buttonBackgroundGraphics = CONTROL_BUTTON_GRAPHICS_LATCHED;
+ buttonIconColors = CONTROL_BUTTON_ICON_COLOR_LATCHED;
+ break;
+ default:
+ LOG("default case at button state");
+ break;
+ }
+
+ RadioHsWidget::defineButton(*target, buttonBackgroundGraphics,
+ suffix, icon, buttonIconColors);
+}
+
+/*!
+ Disables specified push button.
+
+ \param hsButtonIdentifier Which button is to be disabled.
+ */
+void RadioHsWidget::changeButtonToDisabled(int hsButtonIdentifier)
+{
+ LEVEL2(LOG_METHOD_ENTER);
+ buttonEvent(static_cast<ControlButtonIdentifier>(hsButtonIdentifier), Disabled);
+}
+
+/*!
+ Enabled specified push button.
+
+ \param hsButtonIdentifier Which button is to be enabled.
+ */
+void RadioHsWidget::changeButtonToEnabled(int hsButtonIdentifier)
+{
+ LEVEL2(LOG_METHOD_ENTER);
+ changeButtonToReleased(hsButtonIdentifier);
+}
+
+/*!
+ Checks the profile of the device. If profile is offline, user is asked a
+ permission to start the radio in offline profile. Dialog is shown on
+ behalf of the radio asking the permission.
+
+ \returns \c true if radio can be started, \c false if device is in
+ offline profile and user didn't gave permission to start the radio.
+ */
+bool RadioHsWidget::radioStartPermission()
+{
+ LOG_METHOD_ENTER;
+ // This is true by default because we might not be in offline profile and
+ // starting the radio is allowed in other profiles without asking a
+ // permission.
+ bool radioStartPermssion = true;
+ if (mProfileMonitor->isCurrentProfileOffline()) {
+ // Device is in offline profile, ask the user for permission to start
+ HbDeviceMessageBox box(hbTrId(
+ "txt_fmradiohswidget_rad_info_activate_radio_in_offline_mode_hs"),
+ HbMessageBox::MessageTypeQuestion);
+ box.setTimeout(HbPopup::NoTimeout);
+ box.exec();
+ // radioStartPermssion is now true or false, depending what the user
+ // selected. If user didn't gave permission, then radio is not
+ // started.
+ radioStartPermssion = box.isAcceptAction(box.triggeredAction());
+ }
+ return radioStartPermssion;
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radiohswidget/src/radiohswidgetplugin.cpp Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,65 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: FM Radio home screen widget plugin
+*
+*/
+
+// System includes
+#include <qserviceinterfacedescriptor.h>
+#include <qabstractsecuritysession.h>
+#include <qservicecontext.h>
+
+// User includes
+#include "radiohswidgetplugin.h"
+#include "radiohswidget.h"
+
+// Constants
+/*! Home screen widget service interface name. */
+const QLatin1String HOME_SCREEN_WIDGET_INTERFACE_NAME(
+ "com.nokia.symbian.IHomeScreenWidget");
+
+/*!
+ \class RadioHsWidgetPlugin
+ \brief Implementats the home screen widget plugin.
+
+ RadioHsWidgetPlugin implements needed functions for creating instance of
+ RadioHsWidget.
+*/
+
+// ======== MEMBER FUNCTIONS ========
+
+/*!
+ Initialize plugin for FM Radio home screen widget. Contains necessary information about
+ the RadioWidget that it can be loaded through QT Service Framework.
+
+ \returns Pointer to a new RadioHsWidget or to the NULL.
+*/
+QObject *RadioHsWidgetPlugin::createInstance(const QServiceInterfaceDescriptor &descriptor,
+ QServiceContext *context,
+ QAbstractSecuritySession *session)
+{
+ Q_UNUSED(context);
+ Q_UNUSED(session);
+
+ // If descriptor interface name matches
+ if (descriptor.interfaceName() == HOME_SCREEN_WIDGET_INTERFACE_NAME) {
+ // Create and return new FM Radio home screen widget.
+ return new RadioHsWidget();
+ } else {
+ // Otherwise return NULL.
+ return NULL;
+ }
+}
+
+Q_EXPORT_PLUGIN2(fmradiohswidget, RadioHsWidgetPlugin)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radiohswidget/src/radiohswidgetprofilereader.cpp Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,163 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: FM Radio widget process handler
+*
+*/
+
+// System includes
+#include <QDateTime>
+// TODO: Profile information should be accessed from QtMobility when it is
+// ready.
+#include <ProfileEngineSDKCRKeys.h>
+#include "xqsettingsmanager.h"
+#include "xqsettingskey.h"
+#include "xqpublishandsubscribeutils.h"
+
+// User includes
+#include "radiohswidgetprofilereader.h"
+#include "radiohswidget.h"
+#include "radioservicedef.h"
+#include "radiologger.h"
+
+// Constants
+/** Constant for radio running undefined status. */
+const int RADIO_RUNNING_STATUS_UNDEFINED(-1);
+/** Constant for Off-line profile. */
+const int OFFLINE_PROFILE(5);
+
+/*!
+ \class RadioHsWidgetProfileReader
+ \brief Implementation of P&S key reader and monitor.
+
+ RadioHsWidgetProfileReader implements reader and monitor for P&S keys.
+*/
+
+// ======== MEMBER FUNCTIONS ========
+
+/*!
+ Constructs a profile reader which is a child of \a parent.
+
+ Creates XQSettingsManager for monitoring and accessing the P&S keys.
+ Connects to the signals of XQSettingsManager.
+*/
+RadioHsWidgetProfileReader::RadioHsWidgetProfileReader(
+ RadioHsWidget *parent) :
+ QObject(parent),
+ mParent(*parent),
+ mSettingsManager(new XQSettingsManager(this)),
+ mRadioStatus(RADIO_RUNNING_STATUS_UNDEFINED)
+{
+ LOG_METHOD;
+ Radio::connect(mSettingsManager, SIGNAL(itemDeleted(XQSettingsKey)), this,
+ SLOT(handleDeletedItem(XQSettingsKey)));
+ Radio::connect(mSettingsManager, SIGNAL(valueChanged(XQSettingsKey, QVariant)),
+ this, SLOT(handleChanges(XQSettingsKey, QVariant)));
+}
+
+/*!
+ Destructor
+ */
+RadioHsWidgetProfileReader::~RadioHsWidgetProfileReader()
+{
+ LOG_METHOD;
+ XQSettingsKey radioRunningKey(XQSettingsKey::TargetPublishAndSubscribe,
+ KRadioPSUid, KRadioStartupKey);
+ mSettingsManager->stopMonitoring(radioRunningKey);
+}
+
+/*!
+ Start monitoring of radio P&S key. Read also the initial value.
+ */
+void RadioHsWidgetProfileReader::startMonitoringRadioRunningStatus()
+{
+ LOG_METHOD;
+ XQSettingsKey radioRunningKey(XQSettingsKey::TargetPublishAndSubscribe,
+ KRadioPSUid, KRadioStartupKey);
+ // Start monitoring.
+ mSettingsManager->startMonitoring(radioRunningKey);
+ // Read current value.
+ radioRunningStatus(
+ mSettingsManager->readItemValue(radioRunningKey));
+}
+
+/*!
+ Reads the current profile of the device and \returns \c true if the
+ current profile is offline, \c false otherwise.
+ */
+bool RadioHsWidgetProfileReader::isCurrentProfileOffline()
+{
+ LOG_METHOD_RET("%d");
+ XQSettingsKey profileKey(XQSettingsKey::TargetCentralRepository,
+ KCRUidProfileEngine.iUid, KProEngActiveProfile);
+ // Read current value.
+ QVariant profile(mSettingsManager->readItemValue(profileKey));
+ if (profile.canConvert(QVariant::Int) && profile.toInt() == OFFLINE_PROFILE) {
+ return true;
+ }
+ return false;
+}
+
+/*!
+ Handling of deletion of listened keys.
+
+ \param key Deleted key.
+ */
+void RadioHsWidgetProfileReader::handleDeletedItem(const XQSettingsKey &key)
+{
+ LOG_METHOD_ENTER;
+ if (key.uid() == KRadioPSUid && key.key() == KRadioStartupKey) {
+ LOG("KRadioStartupKey deleted");
+ startMonitoringRadioRunningStatus();
+ }
+}
+
+/*!
+ Notifications from settings manager are handled and routed to appropriate
+ private slots.
+
+ \param key Changed key.
+ \param value Value of changed key.
+ */
+void RadioHsWidgetProfileReader::handleChanges(const XQSettingsKey &key,
+ const QVariant& value)
+{
+ LOG_SLOT_CALLER;
+
+ if (key.uid() == KRadioPSUid && key.key()
+ == KRadioStartupKey) {
+ LOG("KRadioStartupKey changed");
+ radioRunningStatus(value);
+ }
+}
+
+/*!
+ Handling changes in radio running P&S key.
+
+ \param value is int representation of time in seconds when radio was
+ started.
+ */
+void RadioHsWidgetProfileReader::radioRunningStatus(
+ const QVariant &value)
+{
+ LOG_METHOD_ENTER;
+ if (value.canConvert(QVariant::Int)) {
+ mRadioStatus = value.toInt();
+ // Notify the observer that radio is running.
+ mParent.handleRadioStateChange(FmRadio::StateRunning);
+ } else {
+ mRadioStatus = RADIO_RUNNING_STATUS_UNDEFINED;
+ // Notify the observer that radio is not running.
+ mParent.handleRadioStateChange(FmRadio::StateNotRunning);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radiohswidget/src/radiohswidgetradioserviceclient.cpp Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,361 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: FM Radio widget radio service client
+*
+*/
+
+// System includes
+#include <xqserviceglobal.h>
+
+// User includes
+#include "radiohswidgetradioserviceclient.h"
+#include "radiohswidget.h"
+#include "radionotificationdata.h"
+#include "radioservicedef.h"
+#include "radiologger.h"
+
+/*!
+ \class RadioHsWidgetRadioServiceClient
+ \brief Implementation of QtHighway based communicator with radio application.
+
+ RadioHsWidgetRadioServiceClient implements monitoring of radio
+ information and controlling of radio. This is done by service request
+ through QtHighway.
+*/
+
+// ======== MEMBER FUNCTIONS ========
+
+/*!
+ Constructs a profile reader which is a child of \a parent.
+ */
+RadioHsWidgetRadioServiceClient::RadioHsWidgetRadioServiceClient(
+ RadioHsWidget *parent) :
+ QObject(parent),
+ mParent(*parent),
+ mRequestPending(false),
+ mRadioMonitorRequest(NULL),
+ mRadioControlRequest(NULL),
+ mDataInitialized(false)
+{
+ LOG_METHOD;
+}
+
+/*!
+ Destructor
+ */
+RadioHsWidgetRadioServiceClient::~RadioHsWidgetRadioServiceClient()
+{
+ LOG_METHOD;
+ stopMonitoring();
+}
+
+/*!
+ Command FM Radio station.
+
+ \param command Command to request radio to perform.
+ */
+void RadioHsWidgetRadioServiceClient::commandFmRadio(
+ const RadioServiceCommand::CommandId command)
+{
+ LOG_METHOD_ENTER;
+ QVariant commandArgument;
+ commandArgument.setValue(static_cast<int>(command));
+ FmRadio::VisibiltyAfterRequest visibility;
+ if (command == RadioServiceCommand::Foreground) {
+ visibility = FmRadio::VisibiltyToForeground;
+ } else if (command == RadioServiceCommand::Background) {
+ visibility = FmRadio::VisibiltyToBackground;
+ } else {
+ visibility = FmRadio::VisibiltyDoNotChange;
+ }
+ sendControlRequest(commandArgument, visibility);
+}
+
+/*!
+ Start radio monitoring.
+
+ \param visibility Desired visibility for the radio after the request.
+ */
+void RadioHsWidgetRadioServiceClient::startMonitoring(
+ FmRadio::VisibiltyAfterRequest visibility)
+{
+ LOG_METHOD_ENTER;
+ createMonitorServiceRequest();
+ sendMonitorRequest(visibility);
+}
+
+/*!
+ Stops radio monitoring.
+ */
+void RadioHsWidgetRadioServiceClient::stopMonitoring()
+{
+ LOG_METHOD_ENTER;
+ // Delete the mRadioMonitorRequest.
+ if (mRadioMonitorRequest) {
+ delete mRadioMonitorRequest;
+ mRadioMonitorRequest = NULL;
+ mRequestPending = false;
+ mDataInitialized = false;
+ }
+}
+
+/*!
+ Creates and returns RadioNotificationData.
+ This is needed because radionotificationdata.h cannot be
+ included on test code.
+ */
+QVariant RadioHsWidgetRadioServiceClient::createRadioNotificationData(int type, const QVariant& data)
+{
+ LOG_METHOD_ENTER;
+ QVariant ret;
+ ret.setValue(RadioNotificationData(type, data));
+ return ret;
+}
+
+
+/*!
+ Handles request errors.
+
+ \param errorCode Code of the error type.
+ \param errorMessage Error message.
+ */
+void RadioHsWidgetRadioServiceClient::handleError(const int errorCode,
+ const QString &errorMessage)
+{
+ LOG_METHOD_ENTER;
+ Q_UNUSED(errorMessage)
+ LEVEL2(LOG_SLOT_CALLER);
+ handleRequestError(errorCode);
+}
+
+/*!
+ Handle changes in FM Radio.
+
+ \param value List of information published by radio.
+ */
+void RadioHsWidgetRadioServiceClient::handleFmRadioChange(
+ const QVariant &value)
+{
+ LOG_METHOD_ENTER;
+ LEVEL2(LOG_SLOT_CALLER);
+ // Request is not pending anymore.
+ mRequestPending = false;
+ // If first request was refresh operation.
+ if (!mDataInitialized) {
+ LOG("Set operation to KRadioServiceMonitorOperation");
+ // Change the operation to the monitoring.
+ mRadioMonitorRequest->setOperation(RADIO_MONITOR_SERVICE_OPERATION);
+ // Data is now initialized.
+ mDataInitialized = true;
+ }
+ // Request notifications again.
+ startMonitoring(FmRadio::VisibiltyDoNotChange);
+
+ // If valid and right kind of data was received.
+ if (value.canConvert(QVariant::List) ) {
+ QVariantList notificationList = value.toList();
+ // Iterate through the list.
+ foreach (const QVariant& variant, notificationList) {
+ // Extract notification data.
+ RadioNotificationData notification = variant.value<RadioNotificationData>();
+ // And it's type.
+ const int notificationId = notification.mType;
+ // And the data
+ const QVariant notificationData = notification.mData;
+ // If the data is valid.
+ if (notificationData.isValid()) {
+ // Notify the observer about the new information.
+ mParent.handleRadioInformationChange(notificationId, notificationData);
+ }
+ }
+ }
+}
+
+/*!
+ Handles request error.
+
+ \param error Identifies the error.
+ */
+void RadioHsWidgetRadioServiceClient::handleRequestError(const int error)
+{
+ LOG_METHOD;
+ QString errorStr;
+ switch (error) {
+ case XQService::ENoError:
+ errorStr = "No error";
+ break;
+ case XQService::EConnectionError:
+ errorStr = "Error in IPC Connection";
+ break;
+ case XQService::EConnectionClosed:
+ errorStr = "IPC Connection is closed";
+ stopMonitoring();
+ mParent.handleRadioStateChange(FmRadio::StateNotRunning);
+ break;
+ case XQService::EServerNotFound:
+ errorStr = "Can not find server";
+ break;
+ case XQService::EIPCError:
+ errorStr = "Known IPC error defined by SDK";
+ break;
+ case XQService::EUnknownError:
+ errorStr = "Unknown IPC error";
+ break;
+ case XQService::ERequestPending:
+ errorStr = "Already pending request";
+ break;
+ default:
+ errorStr = "default case at error";
+ break;
+ }
+ LOG(GETSTRING(errorStr));
+}
+
+/*!
+ Creates control service request object.
+ */
+void RadioHsWidgetRadioServiceClient::createControlServiceRequest()
+{
+ LOG_METHOD_ENTER;
+ if (!mRadioControlRequest) {
+ LOG("Create request");
+ mRadioControlRequest = mApplicationManager.create(
+ RADIO_CONTROL_SERVICE, RADIO_CONTROL_SERVICE_OPERATION, false);
+
+ if (mRadioControlRequest) {
+ LOG("Request created");
+ // Connect request to handle it's error.
+ Radio::connect(mRadioControlRequest,
+ SIGNAL(requestError(int,const QString&)), this,
+ SLOT(handleError(int,const QString&)));
+
+ // Request is synchronous.
+ mRadioControlRequest->setSynchronous(true);
+ // Request is not embedded.
+ mRadioControlRequest->setEmbedded(false);
+ }
+ }
+}
+
+/*!
+ Creates monitor service request object.
+ */
+void RadioHsWidgetRadioServiceClient::createMonitorServiceRequest()
+{
+ LOG_METHOD_ENTER;
+ if (!mRadioMonitorRequest) {
+ // If data is not initialized, set operation to refresh,
+ // otherwise to monitor operation.
+ QString operation = mDataInitialized ? RADIO_MONITOR_SERVICE_OPERATION
+ : RADIO_MONITOR_SERVICE_REFRESH_OPERATION;
+
+ LOG("Create request");
+ mRadioMonitorRequest = mApplicationManager.create(
+ RADIO_MONITOR_SERVICE, operation, false);
+
+ if (mRadioMonitorRequest) {
+ LOG("Request created");
+ // Connect request to handle it's completion.
+ Radio::connect(mRadioMonitorRequest, SIGNAL(requestOk(const QVariant&)),
+ this, SLOT(handleFmRadioChange(const QVariant&)));
+ // Connect request to handle it's error.
+ Radio::connect(mRadioMonitorRequest,
+ SIGNAL(requestError(int,const QString&)), this,
+ SLOT(handleError(int,const QString&)));
+
+ // Request is asynchronous.
+ mRadioMonitorRequest->setSynchronous(false);
+ // Request is not embedded.
+ mRadioMonitorRequest->setEmbedded(false);
+ }
+ }
+}
+
+/*!
+ Sends the control request containing the command.
+
+ \param argument Contains the command.
+ \param visibility Desired visibility for the radio after the request.
+ */
+void RadioHsWidgetRadioServiceClient::sendControlRequest(
+ const QVariant &argument,
+ const FmRadio::VisibiltyAfterRequest visibility)
+{
+ LOG_METHOD_ENTER;
+ if (!argument.isValid()) {
+ return;
+ }
+
+ // If there is not mRadioControlRequest already.
+ if (!mRadioControlRequest) {
+ // Create it.
+ createControlServiceRequest();
+ }
+
+ // Set argument list for request.
+ QVariantList arguments;
+ arguments.append(argument);
+ mRadioControlRequest->setArguments(arguments);
+
+ prepareRequestInfo(mRadioControlRequest, visibility);
+
+ LOG("Send request");
+ bool res = mRadioControlRequest->send();
+
+ /*
+ if (!res) {
+ LOG("Send failed");
+ int error = mRadioControlRequest->lastError();
+ handleRequestError(error);
+ }
+ */
+}
+
+/*!
+ Sends the monitor request.
+
+ \param visibility Desired visibility for the radio after the request.
+ */
+void RadioHsWidgetRadioServiceClient::sendMonitorRequest(
+ const FmRadio::VisibiltyAfterRequest visibility)
+{
+ LOG_METHOD_ENTER;
+ prepareRequestInfo(mRadioMonitorRequest, visibility);
+ if (!mRequestPending) {
+ LOG("Send request");
+ mRequestPending = mRadioMonitorRequest->send();
+ }
+}
+
+/*!
+ Prepares the visibility of the request.
+
+ \param request Request to prepare.
+ \param visibility Desired visibility for the radio after the request.
+ */
+void RadioHsWidgetRadioServiceClient::prepareRequestInfo(
+ XQAiwRequest *request,
+ const FmRadio::VisibiltyAfterRequest visibility)
+{
+ LOG_METHOD_ENTER;
+ XQRequestInfo info;
+ if (visibility == FmRadio::VisibiltyToForeground) {
+ info.setForeground(true);
+ } else if (visibility == FmRadio::VisibiltyToBackground) {
+ info.setBackground(true);
+ }
+ if (request) {
+ request->setInfo(info);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radiohswidget/stub/xqaiwinterfacedescriptor.cpp Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,44 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: XQAiwInterfaceDescriptor stub for FM Radio home screen widget
+* unit testing.
+*
+*/
+
+// User includes
+#include "xqaiwinterfacedescriptor.h"
+#include "radiologger.h"
+
+/*!
+ \class XQAiwInterfaceDescriptor
+ \brief Stub implementation of XQAiwInterfaceDescriptor for unit testing
+*/
+
+// ======== MEMBER FUNCTIONS ========
+
+XQAiwInterfaceDescriptor::XQAiwInterfaceDescriptor()
+{
+ LOG_METHOD_ENTER;
+}
+
+XQAiwInterfaceDescriptor::~XQAiwInterfaceDescriptor()
+{
+ LOG_METHOD_ENTER;
+}
+
+bool XQAiwInterfaceDescriptor::operator==(const XQAiwInterfaceDescriptor& other) const
+{
+ LOG_METHOD_ENTER;
+ return *this == other;
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radiohswidget/stub/xqaiwinterfacedescriptor.h Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,36 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Stub for FM Radio home screen widget unit testing.
+*
+*/
+
+#ifndef XQAIWINTERFACEDESCRIPTOR_H
+#define XQAIWINTERFACEDESCRIPTOR_H
+
+// System includes
+#include <QObject>
+#include <QVariant>
+
+class XQAiwInterfaceDescriptor : public QObject
+{
+ Q_OBJECT
+
+public:
+ XQAiwInterfaceDescriptor();
+ ~XQAiwInterfaceDescriptor();
+ bool operator==(const XQAiwInterfaceDescriptor& other) const;
+
+};
+
+#endif // XQAIWINTERFACEDESCRIPTOR_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radiohswidget/stub/xqaiwrequest.cpp Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,102 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: XQAiwRequest stub for FM Radio home screen widget
+* unit testing.
+*
+*/
+
+// System includes
+#include <QVariant>
+
+// User includes
+#include "xqaiwrequest.h"
+#include "xqrequestinfo.h"
+#include "radioservicedef.h"
+#include "radiologger.h"
+
+extern QVariantList request_mocks;
+extern int send_count;
+
+/*!
+ \class XQAiwRequest
+ \brief Stub implementation of XQAiwRequest for unit testing
+*/
+
+// ======== MEMBER FUNCTIONS ========
+
+XQAiwRequest::XQAiwRequest(const QString &interface,
+ const QString &operation, bool isEmbedded) :
+ mOperation(operation),
+ mRequestCount(0)
+{
+ LOG_METHOD_ENTER;
+}
+
+XQAiwRequest::~XQAiwRequest()
+{
+ LOG_METHOD_ENTER;
+}
+
+static void replyRequestOk(QVariant reply)
+{
+ LOG_METHOD_ENTER;
+}
+
+void XQAiwRequest::setOperation(const QString &operation)
+{
+ LOG_METHOD_ENTER;
+ mOperation = operation;
+}
+
+void XQAiwRequest::setSynchronous(bool synchronous)
+{
+ LOG_METHOD_ENTER;
+}
+
+void XQAiwRequest::setEmbedded(bool embedded)
+{
+ LOG_METHOD_ENTER;
+}
+
+bool XQAiwRequest::send()
+{
+ LOG_METHOD_ENTER;
+ pendingRequests.append(mOperation);
+ replyAfterDelay();
+ return true;
+}
+
+void XQAiwRequest::setInfo(const XQRequestInfo &info)
+{
+ LOG_METHOD_ENTER;
+}
+
+bool XQAiwRequest::replyAfterDelay()
+{
+ LOG_METHOD;
+ QString operationStr;
+ bool ret = true;
+ if (mRequestCount < send_count) {
+ replyRequestOk((request_mocks.at(mRequestCount)).toList());
+ ret = false;
+ }
+ return ret;
+}
+
+void XQAiwRequest::replyRequestOk(const QVariantList &reply)
+{
+ LOG_METHOD_ENTER;
+ ++mRequestCount;
+ emit requestOk(reply);
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radiohswidget/stub/xqaiwrequest.h Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,61 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Stub for FM Radio home screen widget unit testing.
+*
+*/
+
+#ifndef XQAIWREQUEST_H
+#define XQAIWREQUEST_H
+
+// System includes
+#include <QObject>
+#include <QVariant>
+#include <QStringList>
+
+// User includes
+#include <xqrequestinfo.h>
+
+class XQAiwRequest : public QObject
+{
+ Q_OBJECT
+
+public:
+ XQAiwRequest(const QString &interface, const QString &operation, bool isEmbedded);
+ ~XQAiwRequest();
+
+ void replyRequestOk(const QVariantList &reply);
+
+public slots:
+ void setOperation(const QString &operation);
+ void setSynchronous(bool synchronous);
+ void setEmbedded(bool embedded);
+ bool send();
+ void setInfo(const XQRequestInfo &info);
+
+signals:
+ void requestOk(const QVariant& result);
+ void requestError(int errorCode, const QString& errorMessage);
+
+private:
+ bool replyAfterDelay();
+
+
+private: // data
+ QString mOperation;
+ QStringList pendingRequests;
+ int mRequestCount;
+
+};
+
+#endif // XQAIWREQUEST_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radiohswidget/stub/xqapplicationmanager.cpp Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,56 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: XQApplicationManager stub for FM Radio home screen widget
+* unit testing.
+*
+*/
+
+// User includes
+#include "xqapplicationmanager.h"
+#include "xqaiwrequest.h"
+#include "radioservicedef.h"
+#include "radiologger.h"
+
+XQAiwRequest *application_manager_mock_refresh_request = new XQAiwRequest("interface", "operation", false);
+XQAiwRequest *application_manager_mock_monitor_request = new XQAiwRequest("interface", "operation2", false);
+
+/*!
+ \class XQApplicationManager
+ \brief Stub implementation of XQApplicationManager for unit testing
+*/
+
+// ======== MEMBER FUNCTIONS ========
+
+XQApplicationManager::XQApplicationManager()
+{
+ LOG_METHOD_ENTER;
+}
+
+XQApplicationManager::~XQApplicationManager()
+{
+ LOG_METHOD_ENTER;
+}
+
+XQAiwRequest* XQApplicationManager::create(const QString& interface, const QString& operation, bool embedded)
+{
+ LOG_METHOD_ENTER;
+ if (operation.compare(RADIO_MONITOR_SERVICE_REFRESH_OPERATION) == 0) {
+ application_manager_mock_refresh_request = new XQAiwRequest(interface, operation, embedded);
+ return application_manager_mock_refresh_request;
+ } else if (operation.compare(RADIO_MONITOR_SERVICE_OPERATION) == 0) {
+ application_manager_mock_monitor_request = new XQAiwRequest(interface, operation, embedded);
+ return application_manager_mock_monitor_request;
+ }
+ return NULL;
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radiohswidget/stub/xqapplicationmanager.h Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,40 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Stub for FM Radio home screen widget unit testing.
+*
+*/
+
+#ifndef XQAPPLICATIONMANAGER_H
+#define XQAPPLICATIONMANAGER_H
+
+// System includes
+#include <QObject>
+
+// User includes
+#include "xqaiwrequest.h"
+
+class XQApplicationManager : public QObject
+{
+ Q_OBJECT
+
+public:
+
+ XQApplicationManager();
+ ~XQApplicationManager();
+
+ XQAiwRequest* create(const QString& interface, const QString& operation, bool embedded = true);
+
+};
+
+#endif // XQAPPLICATIONMANAGER_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radiohswidget/stub/xqrequestinfo.cpp Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,53 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: XQRequestInfo stub for FM Radio home screen widget
+* unit testing.
+*
+*/
+
+// User includes
+#include "xqrequestinfo.h"
+#include "radiologger.h"
+
+/*!
+ \class XQRequestInfo
+ \brief Stub implementation of XQRequestInfo for unit testing
+*/
+
+// ======== MEMBER FUNCTIONS ========
+
+XQRequestInfo::XQRequestInfo()
+{
+ LOG_METHOD_ENTER;
+}
+
+XQRequestInfo::~XQRequestInfo()
+{
+ LOG_METHOD_ENTER;
+}
+
+void XQRequestInfo::setForeground(bool on)
+{
+ LOG_METHOD_ENTER;
+}
+
+void XQRequestInfo::setBackground(bool on)
+{
+ LOG_METHOD_ENTER;
+}
+
+void XQRequestInfo::setInfo(const QString &key, const QVariant &value)
+{
+ LOG_METHOD_ENTER;
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radiohswidget/stub/xqrequestinfo.h Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,43 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Stub for FM Radio home screen widget unit testing.
+*
+*/
+
+#ifndef XQREQUESTINFO_H
+#define XQREQUESTINFO_H
+
+// System includes
+#include <QObject>
+#include <QVariant>
+
+class XQRequestInfo : public QObject
+{
+ Q_OBJECT
+
+public:
+ XQRequestInfo();
+ ~XQRequestInfo();
+
+ void setForeground(bool on);
+ void setBackground(bool on);
+ void setInfo(const QString &key, const QVariant &value);
+
+public slots:
+
+signals:
+
+};
+
+#endif // XQREQUESTINFO_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radiohswidget/stub/xqsettingskey.cpp Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,60 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: XQSettingsKey stub for FM Radio home screen widget
+* unit testing.
+*
+*/
+
+// User includes
+#include "xqsettingskey.h"
+#include "radiologger.h"
+
+/*!
+ \class XQSettingsKey
+ \brief Stub implementation of XQSettingsKey for unit testing
+*/
+
+// ======== MEMBER FUNCTIONS ========
+
+XQSettingsKey::XQSettingsKey(XQSettingsKey::Target target, long int uid,
+ unsigned long int key)
+{
+ LOG_METHOD_ENTER;
+ m_target = target;
+ m_uid = uid;
+ m_key = key;
+}
+
+XQSettingsKey::~XQSettingsKey()
+{
+ LOG_METHOD_ENTER;
+}
+
+XQSettingsKey::Target XQSettingsKey::target() const
+{
+ LOG_METHOD_ENTER;
+ return m_target;
+}
+
+long int XQSettingsKey::uid() const
+{
+ LOG_METHOD_ENTER;
+ return m_uid;
+}
+
+unsigned long int XQSettingsKey::key() const
+{
+ LOG_METHOD_ENTER;
+ return m_key;
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radiohswidget/stub/xqsettingskey.h Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,43 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Stub for FM Radio home screen widget unit testing.
+*
+*/
+
+#ifndef XQSETTINGSKEY_H
+#define XQSETTINGSKEY_H
+
+class XQSettingsKey
+{
+public:
+ enum Target
+ {
+ TargetCentralRepository = 0,
+ TargetPublishAndSubscribe
+ };
+
+ XQSettingsKey(XQSettingsKey::Target target, long int uid, unsigned long int key);
+ ~XQSettingsKey();
+
+ XQSettingsKey::Target target() const;
+ long int uid() const;
+ unsigned long int key() const;
+
+protected:
+ XQSettingsKey::Target m_target;
+ long int m_uid;
+ unsigned long int m_key;
+};
+
+#endif // XQSETTINGSKEY_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radiohswidget/stub/xqsettingsmanager.cpp Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,65 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: XQSettingsManager stub for FM Radio home screen widget
+* unit testing.
+*
+*/
+
+// User includes
+#include "xqsettingsmanager.h"
+#include "radiologger.h"
+
+extern QVariant settings_manager_mock_return_profile;
+extern QVariant settings_manager_mock_return_2nd_profile;
+extern bool settings_manager_mock_bool_return;
+
+/*!
+ \class XQSettingsManager
+ \brief Stub implementation of XQSettingsManager for unit testing
+*/
+
+// ======== MEMBER FUNCTIONS ========
+
+XQSettingsManager::XQSettingsManager(QObject* parent) : QObject(parent)
+{
+ LOG_METHOD_ENTER;
+}
+
+XQSettingsManager::~XQSettingsManager()
+{
+ LOG_METHOD_ENTER;
+}
+
+QVariant XQSettingsManager::readItemValue(const XQSettingsKey& key, XQSettingsManager::Type type)
+{
+ LOG_METHOD_ENTER;
+ Q_UNUSED(key);
+ Q_UNUSED(type);
+ return settings_manager_mock_return_profile;
+}
+
+bool XQSettingsManager::startMonitoring(const XQSettingsKey& key, XQSettingsManager::Type type)
+{
+ LOG_METHOD_ENTER;
+ // Set the 2nd startup mode.
+ settings_manager_mock_return_profile = settings_manager_mock_return_2nd_profile;
+ emit valueChanged(key, type);
+ return settings_manager_mock_bool_return;
+}
+
+bool XQSettingsManager::stopMonitoring(const XQSettingsKey& key)
+{
+ return true;
+}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radiohswidget/stub/xqsettingsmanager.h Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,68 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Stub for FM Radio home screen widget unit testing.
+*
+*/
+
+#ifndef XQSETTINGSMANAGER_H
+#define XQSETTINGSMANAGER_H
+
+// System includes
+#include <QObject>
+#include <QVariant>
+
+// Forward declarations
+class XQSettingsKey;
+
+class XQSettingsManager : public QObject
+{
+ Q_OBJECT
+
+public:
+
+ enum Type
+ {
+ TypeVariant = 0,
+ TypeInt,
+ TypeDouble,
+ TypeString,
+ TypeByteArray
+ };
+
+ enum Error
+ {
+ NoError = 0,
+ OutOfMemoryError,
+ NotFoundError,
+ AlreadyExistsError,
+ PermissionDeniedError,
+ BadTypeError,
+ NotSupportedError,
+ UnknownError = -1
+ };
+
+ XQSettingsManager(QObject* parent = 0);
+ ~XQSettingsManager();
+
+ QVariant readItemValue(const XQSettingsKey& key, XQSettingsManager::Type type = XQSettingsManager::TypeVariant);
+ bool startMonitoring(const XQSettingsKey& key, XQSettingsManager::Type type = XQSettingsManager::TypeVariant);
+ bool stopMonitoring(const XQSettingsKey& key);
+
+signals:
+ void valueChanged(const XQSettingsKey& key, const QVariant& value);
+ void itemDeleted(const XQSettingsKey& key);
+
+};
+
+#endif // XQSETTINGSMANAGER_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radiohswidget/tsrc/buildflags.pri Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,82 @@
+#
+# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description:
+#
+
+# ##########################################################
+# Start of Flag definitions
+# Add or remove comments to disable or enable the features
+# ##########################################################
+
+# ##########################################################
+# Start of Logging flag definitions
+# ##########################################################
+
+# Full logging flag that enables the full logging including also timestamps
+# Enabled by default in debug builds
+# CONFIG(debug, debug|release) : LOGGING_FLAGS += LOGGING_ENABLED
+
+# Uncomment to enable full logging in release builds
+# LOGGING_FLAGS *= LOGGING_ENABLED
+
+# Timestamp logging flag that enables only timestamp logging
+# LOGGING_FLAGS += TIMESTAMP_LOGGING_ENABLED
+
+# Combines Ui and Engine logs by feeding UI traces to the engine logger
+# LOGGING_FLAGS += COMBINE_WITH_ENGINE_LOGGER
+
+# Logging level
+# 1 - Normal level
+# 2 - More verbose level
+# 3 - Most verbose level
+LOGGING_FLAGS += LOGGING_LEVEL=1
+
+# Select which radio component is being logged
+# 1 - Radio application
+# 2 - Radio homescreen widget
+LOGGING_FLAGS += LOGGED_COMPONENT=2
+
+contains(LOGGING_FLAGS, TIMESTAMP_LOGGING_ENABLED)|contains(LOGGING_FLAGS, LOGGING_ENABLED) {
+
+ # Writes debug prints to file if enabled
+ #LOGGING_FLAGS += TRACE_TO_FILE
+
+ # Settings for the log file name
+ symbian:contains(LOGGING_FLAGS, TRACE_TO_FILE) {
+ LOGGING_FLAGS += \"TRACE_OUTPUT_FILE=\\\"c:/logs/radio/radiohswidget.txt\\\"\"
+ LOGGING_FLAGS += FILTER_BY_LOGMARKER=true
+ }
+}
+
+# Method for testing signal-slot connections
+# 1 - Log failed connection
+# 2 - Log failed connection and halt debugger
+LOGGING_FLAGS += CONNECT_TEST_MODE=2
+
+# Logging is always enabled in Win32 environment
+win32:LOGGING_FLAGS *= LOGGING_ENABLED
+
+DEFINES += $$LOGGING_FLAGS
+
+# ##########################################################
+# End of Flag definitions
+# ##########################################################
+
+# $$_PRO_FILE_PWD_ points to the directory of the pro file
+MOC_DIR = $$_PRO_FILE_PWD_/tmp
+RCC_DIR = $$_PRO_FILE_PWD_/tmp
+OBJECTS_DIR = $$_PRO_FILE_PWD_/tmp
+UI_DIR = $$_PRO_FILE_PWD_/tmp
+UI_HEADERS_DIR = $$_PRO_FILE_PWD_/tmp
+UI_SOURCES_DIR = $$_PRO_FILE_PWD_/tmp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radiohswidget/tsrc/inc/radiohswidget.h Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,93 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: FM Radio home screen widget unit tests.
+*
+*/
+
+#ifndef T_RADIOHSWIDGETSTUB_H
+#define T_RADIOHSWIDGETSTUB_H
+
+// INCLUDES
+#include <QObject>
+#include <QVariant>
+#include <QList>
+
+/*!
+ \struct ReceivedInfo
+ \brief Helper to store received information on unit tests.
+*/
+struct ReceivedInfo {
+ /*! Stores the type of received information. */
+ int informationType;
+ /*! Stores the actual data of received information. */
+ QVariant information;
+};
+
+/*!
+ \namespace FmRadio
+ \brief Wraps enumerators for radio state and service request visibility.
+ */
+namespace FmRadio
+{
+ /*! Enum for radio application states. */
+ enum State
+ {
+ StateUndefined,
+ StateNotRunning,
+ StateStarting,
+ StateRunning,
+ StateSeeking,
+ StateAntennaNotConnected,
+ StateClosing
+ };
+
+ /*! Enum for controlling the visibility of the radio application. */
+ enum VisibiltyAfterRequest
+ {
+ VisibiltyDoNotChange,
+ VisibiltyToForeground,
+ VisibiltyToBackground
+ };
+
+}
+
+class RadioHsWidget : public QObject
+{
+ Q_OBJECT
+
+public:
+
+ RadioHsWidget();
+ ~RadioHsWidget();
+
+ void handleRadioInformationChange(const int informationType,
+ const QVariant &information);
+
+ void handleRadioStateChange(const QVariant &value);
+
+ ReceivedInfo receivedInformation();
+ int receivedInformationCount();
+
+ void reset();
+
+private: // data
+
+ /*! Stores received information. Correctness of
+ RadioHsWidgetRadioServiceClient mediated information is checked from here.
+ */
+ QList<ReceivedInfo> mReceivedInformation;
+
+};
+
+#endif // T_RADIOHSWIDGETSTUB_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radiohswidget/tsrc/inc/t_radiohswidget.h Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,86 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+#ifndef T_RADIOHSWIDGET_H_
+#define T_RADIOHSWIDGET_H_
+
+
+// System includes
+#include <QtTest/QtTest>
+
+// User includes
+#include "radiohswidget.h"
+#include "radiohswidgetprofilereader.h"
+#include "radiohswidgetradioserviceclient.h"
+
+/*!
+ \struct SendInfo
+ \brief Helper to store send information on unit tests.
+*/
+struct SendInfo {
+ /*! Stores the type of information send. */
+ int informationType;
+ /*! Stores the information to send. */
+ QVariant information;
+ /*! Stores the actual data of information send. */
+ QVariant data;
+};
+
+
+class TestRadioHsWidget : public QObject
+{
+ Q_OBJECT
+
+public:
+
+ TestRadioHsWidget();
+ ~TestRadioHsWidget();
+
+public slots:
+
+private slots:
+ // test framework called slots
+ void initTestCase();
+ void init();
+ void cleanup();
+ void cleanupTestCase();
+ void offlineModeTest();
+ void validReplies();
+ void invalidReplies();
+
+private:
+ void createSendInfo(int informationType, const QVariant information);
+ void verifyReceivedInformation(int informationType,
+ const QVariant &receivedInformation, const QVariant &sendInformation);
+
+private: // Data
+ /*! Stores RadioHsWidget stub. */
+ QScopedPointer<RadioHsWidget> mRadioHsWidgetStub;
+ /*! Stores RadioHsWidgetProfileReader. */
+ QScopedPointer<RadioHsWidgetProfileReader> mProfileReader;
+ /*! Stores RadioHsWidgetRadioServiceClient. */
+ QScopedPointer<RadioHsWidgetRadioServiceClient> mServiceClient;
+
+ /*! Stores refresh request mock. */
+ //XQAiwRequest *application_manager_mock_refresh_request;
+
+ /*! Stores send information. */
+ QList<SendInfo> mSendInfos;
+};
+
+#endif /* T_RADIOHSWIDGET_H_ */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radiohswidget/tsrc/src/radiohswidget.cpp Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,107 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: FM Radio home screen widget
+*
+*/
+
+// User includes
+#include "radiohswidget.h"
+#include "radiologger.h"
+
+// This is defined in t_radiohswidget.cpp
+extern int EMPTY_REPLY;
+
+/*!
+ \class RadioHsWidget
+ \brief Stub implementation of FM Radio home screen widget for unit
+ testing.
+
+ RadioHsWidget implements needed functions for the FM Radio home screen
+ widget unit tests.
+*/
+
+// ======== MEMBER FUNCTIONS ========
+
+/*!
+ Constrcutor.
+ */
+RadioHsWidget::RadioHsWidget()
+{
+ LOG_METHOD;
+}
+
+/*!
+ Destructor.
+ */
+RadioHsWidget::~RadioHsWidget()
+{
+ LOG_METHOD;
+}
+
+/*!
+ Handles changes in FM Radio information.
+
+ \param informationType Type of changed information.
+ \param information Actual information.
+ */
+void RadioHsWidget::handleRadioInformationChange(const int informationType,
+ const QVariant &information)
+{
+ LOG_METHOD;
+ if (informationType != EMPTY_REPLY) {
+ ReceivedInfo info;
+ info.informationType = informationType;
+ info.information = information;
+ mReceivedInformation.append(info);
+ }
+}
+
+/*!
+ Handles changes in FM Radio state.
+
+ \param value New state of the radio application.
+*/
+void RadioHsWidget::handleRadioStateChange(const QVariant &value)
+{
+ LOG_METHOD;
+ Q_UNUSED(value);
+}
+
+/*!
+ Returns the last received information and removes it from the list.
+*/
+ReceivedInfo RadioHsWidget::receivedInformation()
+{
+ LOG_METHOD;
+ ReceivedInfo ret;
+ if (!mReceivedInformation.isEmpty()) {
+ ret = mReceivedInformation.takeLast();
+ }
+ return ret;
+}
+/*!
+ Returns the count of received information.
+*/
+int RadioHsWidget::receivedInformationCount()
+{
+ return mReceivedInformation.count();
+}
+
+/*!
+ Clears the received info list.
+*/
+void RadioHsWidget::reset()
+{
+ mReceivedInformation.clear();
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radiohswidget/tsrc/src/t_radiohswidget.cpp Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,405 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+// System includes
+#include <QVariant>
+
+// User Includes
+#include "t_radiohswidget.h"
+#include "xqsettingsmanager.h"
+#include "xqapplicationmanager.h"
+#include "xqaiwrequest.h"
+#include "xqaiwinterfacedescriptor.h"
+#include "radioservicedef.h"
+#include "radiologger.h"
+
+// Constants
+/**
+* From ProfileEngineSDKCRKeys.h
+* The id of the currently active profile, integer value.
+* Possible values:
+*
+* 0 = General profile (default value)<br>
+* 1 = Silent profile<br>
+* 2 = Meeting profile<br>
+* 3 = Outdoor profile<br>
+* 4 = Pager profile<br>
+* 5 = Off-line profile<br>
+* 6 = Drive profile<br>
+* 30-49 = User-created profiles<br>
+**/
+const int PROFILE_GENERAL(0);
+const int PROFILE_SILENT(1);
+const int PROFILE_MEETING(2);
+const int PROFILE_OUTDOOR(3);
+const int PROFILE_PAGER(4);
+const int PROFILE_OFFLINE(5);
+const int PROFILE_DRIVE(6);
+const int PROFILE_USER_CREATED(35);
+
+/** Requests are not embedded. */
+const bool EMBEDDED_REQUEST(false);
+
+/** Last request should be answered with empty reply. */
+int EMPTY_REPLY(-5);
+
+/** Test values for favorite station count. */
+const int FAVORITE_STATION_COUNT_INVALID_TOO_LOW1(-56);
+const int FAVORITE_STATION_COUNT_INVALID_TOO_LOW2(-1);
+const int FAVORITE_STATION_COUNT_VALID_LOWER_BOUNDARY(0);
+const int FAVORITE_STATION_COUNT_VALID1(1);
+const int FAVORITE_STATION_COUNT_VALID2(2);
+const int FAVORITE_STATION_COUNT_VALID3(3);
+const int FAVORITE_STATION_COUNT_VALID4(9);
+const int FAVORITE_STATION_COUNT_VALID5(78);
+const int FAVORITE_STATION_COUNT_VALID_UPPER_BOUNDARY(100);
+const int FAVORITE_STATION_COUNT_INVALID_TOO_HIGH1(101);
+const int FAVORITE_STATION_COUNT_INVALID_TOO_HIGH2(1256);
+
+/** Test values for textual information. */
+const QString TEST_FREQUENCY("99.9");
+const QString TEST_NAME("Radio Test");
+const QString TEST_GENRE("Test GenRe");
+const QString TEST_RADIO_TEXT("Test RDS");
+const QString TEST_DYNAMIC_PSNAME("Dynamic PS Name test");
+const QString TEST_EMPTY_STRING("");
+const QString TEST_INVALID_STRING;
+/** This test string contains 1000 characters. */
+const QString TEST_TOO_LONG_STRING("1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890");
+
+/** Test values for service notification types. */
+const int RADIO_SERVICE_NOTIFICATION_ID_INVALID_TOO_LOW1(-357);
+const int RADIO_SERVICE_NOTIFICATION_ID_INVALID_TOO_LOW2(-1);
+const int RADIO_SERVICE_NOTIFICATION_ID_INVALID_TOO_LOW3(0);
+const int RADIO_SERVICE_NOTIFICATION_ID_VALID_LOWER_BOUNDARY(1);
+const int RADIO_SERVICE_NOTIFICATION_ID_VALID_UPPER_BOUNDARY(8);
+const int RADIO_SERVICE_NOTIFICATION_ID_INVALID_TOO_HIGH1(9);
+const int RADIO_SERVICE_NOTIFICATION_ID_INVALID_TOO_HIGH2(57982);
+const int RADIO_STATUS_INVALID_TOO_LOW1(-581);
+const int RADIO_STATUS_INVALID_TOO_LOW2(-1);
+const int RADIO_STATUS_VALID_LOWER_BOUNDARY(0);
+const int RADIO_STATUS_VALID_UPPER_BOUNDARY(5);
+const int RADIO_STATUS_INVALID_TOO_HIGH1(6);
+const int RADIO_STATUS_INVALID_TOO_HIGH2(456);
+
+/** Mock returns for settings manager stub. */
+QVariant settings_manager_mock_return_profile;
+QVariant settings_manager_mock_return_2nd_profile;
+bool settings_manager_mock_bool_return;
+
+/** These request are defined in stub xqapplicationmanager.cpp. */
+extern XQAiwRequest *application_manager_mock_refresh_request;
+extern XQAiwRequest *application_manager_mock_monitor_request;
+
+/** List for request mocks. */
+QVariantList request_mocks;
+/** Amount of requests send. */
+int send_count;
+
+
+/*!
+ \class TestRadioHsWidget
+ \brief Unit testing for FM Radio hs widget.
+
+ TestRadioHsWidget implements needed functions for the FM Radio home screen
+ widget unit tests.
+*/
+
+// ======== MEMBER FUNCTIONS ========
+
+/*!
+ Main function.
+
+ There's been problems with QTEST_MAIN macro, so main function is defined
+ here.
+*/
+int main(int /* argc*/, char *argv[])
+{
+ LOG_METHOD_ENTER;
+ TestRadioHsWidget tv;
+
+ char *pass[3];
+ pass[0] = argv[0];
+ pass[1] = "-o";
+ pass[2] = "c:\\data\\testradiohswidget.txt";
+
+ int res = QTest::qExec(&tv, 3, pass);
+
+ return res;
+}
+
+/*!
+ Constructor.
+ */
+TestRadioHsWidget::TestRadioHsWidget()
+{
+ LOG_METHOD_ENTER;
+}
+
+
+/*!
+ Destructor.
+ */
+TestRadioHsWidget::~TestRadioHsWidget()
+{
+ LOG_METHOD_ENTER;
+}
+
+/*!
+ Called before each testfunction is executed.
+ */
+void TestRadioHsWidget::init()
+{
+ LOG_METHOD_ENTER;
+ settings_manager_mock_return_profile = PROFILE_GENERAL;
+ request_mocks.clear();
+ mSendInfos.clear();
+ send_count = -1;
+ mRadioHsWidgetStub.data()->reset();
+}
+
+/*!
+ Called after every testfunction.
+ */
+void TestRadioHsWidget::cleanup()
+{
+ LOG_METHOD_ENTER;
+}
+
+/*!
+ Called before the first testfunction is executed
+ */
+void TestRadioHsWidget::initTestCase()
+{
+ LOG_METHOD_ENTER;
+ mRadioHsWidgetStub.reset(new RadioHsWidget());
+ QVERIFY(mRadioHsWidgetStub);
+ mProfileReader.reset(new RadioHsWidgetProfileReader(mRadioHsWidgetStub.data()));
+ QVERIFY(mProfileReader);
+ mServiceClient.reset(new RadioHsWidgetRadioServiceClient(mRadioHsWidgetStub.data()));
+ QVERIFY(mServiceClient);
+}
+
+/*!
+ Called after the last testfunction was executed.
+ */
+void TestRadioHsWidget::cleanupTestCase()
+{
+ LOG_METHOD_ENTER;
+}
+
+/*!
+ Tests RadioHsWidgetProfileReader and it's isCurrentProfileOffline()
+ function.
+ */
+void TestRadioHsWidget::offlineModeTest()
+{
+ LOG_METHOD;
+ settings_manager_mock_return_profile = PROFILE_GENERAL;
+ bool isOffline = mProfileReader.data()->isCurrentProfileOffline();
+ QVERIFY2(( isOffline == false ), "FmRadioHsWidget:RadioHsWidget profile is offline");
+ settings_manager_mock_return_profile = PROFILE_OFFLINE;
+ isOffline = mProfileReader.data()->isCurrentProfileOffline();
+ QVERIFY2(( isOffline == true ), "FmRadioHsWidget:RadioHsWidget profile is not offline");
+ settings_manager_mock_return_profile = PROFILE_USER_CREATED;
+ isOffline = mProfileReader.data()->isCurrentProfileOffline();
+ QVERIFY2(( isOffline == false ), "FmRadioHsWidget:RadioHsWidget profile is offline");
+}
+
+/*!
+ Tests RadioHsWidgetRadioServiceClient class and it's ability to receive
+ and forward valid information.
+ */
+void TestRadioHsWidget::validReplies()
+{
+ LOG_METHOD;
+ // Replies that should be ok.
+ createSendInfo(RadioServiceNotification::FavoriteCount, QVariant(FAVORITE_STATION_COUNT_VALID_LOWER_BOUNDARY));
+ createSendInfo(RadioServiceNotification::FavoriteCount, QVariant(FAVORITE_STATION_COUNT_VALID1));
+ createSendInfo(RadioServiceNotification::FavoriteCount, QVariant(FAVORITE_STATION_COUNT_VALID2));
+ createSendInfo(RadioServiceNotification::FavoriteCount, QVariant(FAVORITE_STATION_COUNT_VALID3));
+ createSendInfo(RadioServiceNotification::FavoriteCount, QVariant(FAVORITE_STATION_COUNT_VALID4));
+ createSendInfo(RadioServiceNotification::FavoriteCount, QVariant(FAVORITE_STATION_COUNT_VALID5));
+ createSendInfo(RadioServiceNotification::FavoriteCount, QVariant(FAVORITE_STATION_COUNT_VALID_UPPER_BOUNDARY));
+ createSendInfo(RadioServiceNotification::CurrentIsFavorite, QVariant(true));
+ createSendInfo(RadioServiceNotification::CurrentIsFavorite, QVariant(false));
+ createSendInfo(RadioServiceNotification::RadioStatus, QVariant(RadioStatus::UnSpecified));
+ createSendInfo(RadioServiceNotification::RadioStatus, QVariant(RadioStatus::Playing));
+ createSendInfo(RadioServiceNotification::RadioStatus, QVariant(RadioStatus::Muted));
+ createSendInfo(RadioServiceNotification::RadioStatus, QVariant(RadioStatus::Seeking));
+ createSendInfo(RadioServiceNotification::RadioStatus, QVariant(RadioStatus::NoAntenna));
+ createSendInfo(RadioServiceNotification::RadioStatus, QVariant(RadioStatus::PoweringOff));
+ createSendInfo(RadioServiceNotification::RadioStatus, QVariant(RADIO_STATUS_VALID_LOWER_BOUNDARY));
+ createSendInfo(RadioServiceNotification::RadioStatus, QVariant(RADIO_STATUS_VALID_UPPER_BOUNDARY));
+ createSendInfo(RadioServiceNotification::Frequency, QVariant(TEST_FREQUENCY));
+ createSendInfo(RadioServiceNotification::Name, QVariant(TEST_NAME));
+ createSendInfo(RadioServiceNotification::Name, QVariant(TEST_EMPTY_STRING));
+ createSendInfo(RadioServiceNotification::Genre, QVariant(TEST_GENRE));
+ createSendInfo(RadioServiceNotification::RadioText, QVariant(TEST_RADIO_TEXT));
+ createSendInfo(RadioServiceNotification::DynamicPS, QVariant(TEST_DYNAMIC_PSNAME));
+ // Empty reply should be last to put RServiceClient to make an request, which is not replied.
+ createSendInfo(EMPTY_REPLY, QVariant(EMPTY_REPLY));
+
+ send_count = mSendInfos.count();
+
+ mServiceClient.data()->startMonitoring(FmRadio::VisibiltyToBackground);
+ mServiceClient.data()->stopMonitoring();
+
+ int receivedCount = mRadioHsWidgetStub.data()->receivedInformationCount();
+ QVERIFY2((receivedCount == send_count - 1), "Send and received counts doesn't match");
+
+ ReceivedInfo temp;
+ for (int i = 0; i < send_count - 1; i++) {
+ temp = mRadioHsWidgetStub.data()->receivedInformation();
+ QVERIFY(temp.informationType == mSendInfos.at(i).informationType);
+ verifyReceivedInformation(temp.informationType, temp.information, mSendInfos.at(i).information);
+ }
+}
+
+/*!
+ Tests RadioHsWidgetRadioServiceClient class and it's ability to receive
+ and forward invalid information.
+ */
+void TestRadioHsWidget::invalidReplies()
+{
+ LOG_METHOD;
+ QList<int> skipSendInfo;
+ // Replies that should not be ok.
+ createSendInfo(RadioServiceNotification::FavoriteCount, QVariant(FAVORITE_STATION_COUNT_INVALID_TOO_LOW1));
+ createSendInfo(RadioServiceNotification::FavoriteCount, QVariant(FAVORITE_STATION_COUNT_INVALID_TOO_LOW2));
+ createSendInfo(RadioServiceNotification::FavoriteCount, QVariant(FAVORITE_STATION_COUNT_INVALID_TOO_HIGH1));
+ createSendInfo(RadioServiceNotification::FavoriteCount, QVariant(FAVORITE_STATION_COUNT_INVALID_TOO_HIGH2));
+ createSendInfo(RadioServiceNotification::FavoriteCount, QVariant());
+ skipSendInfo.append(request_mocks.count() - 1);
+ createSendInfo(RadioServiceNotification::CurrentIsFavorite, QVariant());
+ skipSendInfo.append(request_mocks.count() - 1);
+ createSendInfo(RadioServiceNotification::RadioStatus, QVariant(RADIO_STATUS_INVALID_TOO_LOW1));
+ createSendInfo(RadioServiceNotification::RadioStatus, QVariant(RADIO_STATUS_INVALID_TOO_LOW1));
+ createSendInfo(RadioServiceNotification::RadioStatus, QVariant(RADIO_STATUS_INVALID_TOO_HIGH1));
+ createSendInfo(RadioServiceNotification::RadioStatus, QVariant(RADIO_STATUS_INVALID_TOO_HIGH2));
+ createSendInfo(RadioServiceNotification::RadioStatus, QVariant());
+ skipSendInfo.append(request_mocks.count() - 1);
+ createSendInfo(RadioServiceNotification::Frequency, QVariant());
+ skipSendInfo.append(request_mocks.count() - 1);
+ createSendInfo(RadioServiceNotification::Name, QVariant(TEST_INVALID_STRING));
+ createSendInfo(RadioServiceNotification::Name, QVariant(TEST_TOO_LONG_STRING));
+ createSendInfo(RadioServiceNotification::Name, QVariant());
+ skipSendInfo.append(request_mocks.count() - 1);
+ createSendInfo(RadioServiceNotification::Genre, QVariant());
+ skipSendInfo.append(request_mocks.count() - 1);
+ createSendInfo(RadioServiceNotification::RadioText, QVariant());
+ skipSendInfo.append(request_mocks.count() - 1);
+ createSendInfo(RadioServiceNotification::DynamicPS, QVariant());
+ skipSendInfo.append(request_mocks.count() - 1);
+ // Replies that should generate a warning.
+ createSendInfo(RADIO_SERVICE_NOTIFICATION_ID_VALID_LOWER_BOUNDARY, QVariant(TEST_EMPTY_STRING));
+ createSendInfo(RADIO_SERVICE_NOTIFICATION_ID_VALID_UPPER_BOUNDARY, QVariant(TEST_EMPTY_STRING));
+ createSendInfo(RADIO_SERVICE_NOTIFICATION_ID_INVALID_TOO_LOW1, QVariant(TEST_EMPTY_STRING));
+ createSendInfo(RADIO_SERVICE_NOTIFICATION_ID_INVALID_TOO_LOW2, QVariant(TEST_EMPTY_STRING));
+ createSendInfo(RADIO_SERVICE_NOTIFICATION_ID_INVALID_TOO_LOW3, QVariant(TEST_EMPTY_STRING));
+ createSendInfo(RADIO_SERVICE_NOTIFICATION_ID_INVALID_TOO_HIGH1, QVariant(TEST_EMPTY_STRING));
+ createSendInfo(RADIO_SERVICE_NOTIFICATION_ID_INVALID_TOO_HIGH2, QVariant(TEST_EMPTY_STRING));
+ // Empty reply should be last to put RServiceClient to make an request, which is not replied.
+ createSendInfo(EMPTY_REPLY, QVariant(EMPTY_REPLY));
+
+ send_count = mSendInfos.count();
+
+ mServiceClient.data()->startMonitoring(FmRadio::VisibiltyToBackground);
+ mServiceClient.data()->stopMonitoring();
+
+ int receivedCount = mRadioHsWidgetStub.data()->receivedInformationCount();
+ int skippedCount = skipSendInfo.count();
+ QVERIFY2((receivedCount == send_count - skippedCount - 1), "Send and received counts doesn't match");
+
+ ReceivedInfo temp;
+ for (int i = 0; i < send_count - 1; i++) {
+ if (skipSendInfo.contains(i)) {
+ // Skip verification for information that was filtered in
+ // RadioHsWidgetRadioServiceClient.
+ continue;
+ }
+ temp = mRadioHsWidgetStub.data()->receivedInformation();
+ QVERIFY(temp.informationType == mSendInfos.at(i).informationType);
+ verifyReceivedInformation(temp.informationType, temp.information, mSendInfos.at(i).information);
+ }
+}
+
+/*!
+ Helper function to store send information and append it to a request
+ mocks.
+ */
+void TestRadioHsWidget::createSendInfo(int informationType, const QVariant information)
+{
+ SendInfo info;
+ QVariantList notificationList;
+
+ info.informationType = informationType;
+ info.information = information;
+ info.data = QVariant(mServiceClient.data()->
+ createRadioNotificationData(
+ info.informationType,
+ info.information
+ ));
+
+ mSendInfos.append(info);
+
+ notificationList.append(info.data);
+ request_mocks.append(QVariant(notificationList));
+}
+
+/*!
+ Helper function to verify receved information.
+ */
+void TestRadioHsWidget::verifyReceivedInformation(int informationType,
+ const QVariant &receivedInformation, const QVariant &sendInformation)
+{
+ switch (informationType) {
+ case RadioServiceNotification::CurrentIsFavorite:
+ QVERIFY(receivedInformation.canConvert(QVariant::Bool));
+ QCOMPARE(receivedInformation.toBool(), sendInformation.toBool());
+ break;
+ case RadioServiceNotification::FavoriteCount:
+ // Fall through because of similar handling
+ case RadioServiceNotification::RadioStatus:
+ QVERIFY(receivedInformation.canConvert(QVariant::Int));
+ QCOMPARE(receivedInformation.toInt(), sendInformation.toInt());
+ break;
+ case RadioServiceNotification::Frequency:
+ // Fall through because of similar type of information and thus
+ // similar handling
+ case RadioServiceNotification::Name:
+ // Fall through because of similar type of information and thus
+ // similar handling
+ case RadioServiceNotification::Genre:
+ // Fall through because of similar type of information and thus
+ // similar handling
+ case RadioServiceNotification::RadioText:
+ // Fall through because of similar type of information and thus
+ // similar handling
+ case RadioServiceNotification::DynamicPS:
+ QVERIFY(receivedInformation.canConvert(QVariant::String));
+ QCOMPARE(receivedInformation.toString(), sendInformation.toString());
+ break;
+ default:
+ QWARN("Default case, shouldn't be here except if specifically testing RadioServiceNotification id out of bounds.");
+ QVERIFY(receivedInformation.canConvert(QVariant::String));
+ QCOMPARE(receivedInformation.toString(), sendInformation.toString());
+ break;
+ }
+}
+
+//QTEST_MAIN(t_radiohswidget)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/radiohswidget/tsrc/t_radiohswidget.pro Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,64 @@
+#
+# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description:
+#
+
+TEMPLATE = app
+TARGET = t_radiohswidget
+
+DEFINES -= XQSETTINGSMANAGER_LIBRARY
+DEFINES += XQSETTINGSMANAGER_NO_LIBRARY
+DEFINES -= XQSERVICE_EXPORT
+DEFINES += XQ_BUILD_XQSERVICE_LIB
+DEFINES -= XQSERVICEUTIL_EXPORT
+DEFINES += XQ_BUILD_XQSERVICEUTIL_LIB
+
+symbian: {
+ TARGET.CAPABILITY = All -TCB -DRM
+ CONFIG -= hb
+ MMP_RULES += SMPSAFE
+}
+
+INCLUDEPATH += ../stub
+INCLUDEPATH += ../../common
+
+QT += core
+QT += testlib
+
+CONFIG += qtestlib
+
+HEADERS += inc/t_radiohswidget.h
+HEADERS += inc/radiohswidget.h
+HEADERS += ../stub/xqsettingsmanager.h
+HEADERS += ../stub/xqsettingskey.h
+HEADERS += ../stub/xqapplicationmanager.h
+HEADERS += ../stub/xqaiwrequest.h
+HEADERS += ../stub/xqrequestinfo.h
+HEADERS += ../stub/xqaiwinterfacedescriptor.h
+HEADERS += ../inc/radiohswidgetprofilereader.h
+HEADERS += ../inc/radiohswidgetradioserviceclient.h
+
+SOURCES += src/t_radiohswidget.cpp
+SOURCES += src/radiohswidget.cpp
+SOURCES += ../stub/xqsettingsmanager.cpp
+SOURCES += ../stub/xqsettingskey.cpp
+SOURCES += ../stub/xqapplicationmanager.cpp
+SOURCES += ../stub/xqaiwrequest.cpp
+SOURCES += ../stub/xqrequestinfo.cpp
+SOURCES += ../stub/xqaiwinterfacedescriptor.cpp
+SOURCES += ../src/radiohswidgetprofilereader.cpp
+SOURCES += ../src/radiohswidgetradioserviceclient.cpp
+SOURCES += ../../common/radiologger.cpp
+
+include(buildflags.pri)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tsrc/bld.inf Fri Jun 25 19:09:05 2010 +0300
@@ -0,0 +1,24 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+PRJ_MMPFILES
+
+PRJ_TESTMMPFILES
+#include "../radioengine/utils/stub/group/bld.inf"
+#include "../radioengine/settings/stub/group/bld.inf"
+#include "../radioengine/engine/stub/group/bld.inf"
+#include "../radioengine/settings/tsrc/group/bld.inf"
