# HG changeset patch # User hgs # Date 1286260282 -10800 # Node ID a8ba0c289b44bb12f757e53baeff76783c1007ba # Parent bbebb023546621d5c2370ec2dd702cc47b2d81c1 201039 diff -r bbebb0235466 -r a8ba0c289b44 package_definition.xml --- a/package_definition.xml Mon Sep 20 18:04:48 2010 +0300 +++ b/package_definition.xml Tue Oct 05 09:31:22 2010 +0300 @@ -31,6 +31,9 @@ + + + @@ -39,7 +42,7 @@ - + @@ -47,7 +50,7 @@ - + diff -r bbebb0235466 -r a8ba0c289b44 radioapp/bin/fmradio_en_US.qm Binary file radioapp/bin/fmradio_en_US.qm has changed diff -r bbebb0235466 -r a8ba0c289b44 radioapp/bwins/fmradiouiengineu.def --- a/radioapp/bwins/fmradiouiengineu.def Mon Sep 20 18:04:48 2010 +0300 +++ b/radioapp/bwins/fmradiouiengineu.def Tue Oct 05 09:31:22 2010 +0300 @@ -70,187 +70,189 @@ ?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) - ?localCount@RadioStationModel@@QAEHXZ @ 72 NONAME ; int RadioStationModel::localCount(void) - ?list@RadioStationModel@@QBEABV?$QMap@IVRadioStation@@@@XZ @ 73 NONAME ; class QMap const & RadioStationModel::list(void) const - ?tr@RadioStationModel@@SA?AVQString@@PBD0@Z @ 74 NONAME ; class QString RadioStationModel::tr(char const *, char const *) - ?findClosest@RadioStationModel@@QAE?AVRadioStation@@IW4Mode@StationSkip@@@Z @ 75 NONAME ; class RadioStation RadioStationModel::findClosest(unsigned int, enum StationSkip::Mode) - ?flags@RadioStationModel@@UBE?AV?$QFlags@W4ItemFlag@Qt@@@@ABVQModelIndex@@@Z @ 76 NONAME ; class QFlags RadioStationModel::flags(class QModelIndex const &) const - ?launchRadioServer@RadioUiEngine@@SAXXZ @ 77 NONAME ; void RadioUiEngine::launchRadioServer(void) - ?staticMetaObject@RadioScannerEngine@@2UQMetaObject@@B @ 78 NONAME ; struct QMetaObject const RadioScannerEngine::staticMetaObject - ?id@RadioHistoryItem@@QBEHXZ @ 79 NONAME ; int RadioHistoryItem::id(void) const - ?stationsInRange@RadioUiEngine@@QAE?AV?$QList@VRadioStation@@@@II@Z @ 80 NONAME ; class QList RadioUiEngine::stationsInRange(unsigned int, unsigned int) - ?trUtf8@RadioUiEngine@@SA?AVQString@@PBD0@Z @ 81 NONAME ; class QString RadioUiEngine::trUtf8(char const *, char const *) - ?tr@RadioScannerEngine@@SA?AVQString@@PBD0H@Z @ 82 NONAME ; class QString RadioScannerEngine::tr(char const *, char const *, int) - ?setPiCode@RadioStation@@AAE_NHW4Region@RadioRegion@@@Z @ 83 NONAME ; bool RadioStation::setPiCode(int, enum RadioRegion::Region) - ?data_ptr@RadioHistoryItem@@QAEAAV?$QSharedDataPointer@VRadioHistoryItemPrivate@@@@XZ @ 84 NONAME ; class QSharedDataPointer & RadioHistoryItem::data_ptr(void) - ?radioText@RadioStation@@QBE?AVQString@@XZ @ 85 NONAME ; class QString RadioStation::radioText(void) const - ?setData@RadioStationModel@@UAE_NABVQModelIndex@@ABVQVariant@@H@Z @ 86 NONAME ; bool RadioStationModel::setData(class QModelIndex const &, class QVariant const &, int) - ?lastVolume@RadioUiEngine@@SAHXZ @ 87 NONAME ; int RadioUiEngine::lastVolume(void) - ?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) - ?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) - ?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 &) - ?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 &) - ?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 & 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) - ??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 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) - ?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 *) - ?hasSentRds@RadioStation@@QBE_NXZ @ 143 NONAME ; bool RadioStation::hasSentRds(void) const - ?presetIndex@RadioStation@@QBEHXZ @ 144 NONAME ; int RadioStation::presetIndex(void) const - ?cancel@RadioScannerEngine@@QAEXXZ @ 145 NONAME ; void RadioScannerEngine::cancel(void) - ?staticMetaObject@RadioStationModel@@2UQMetaObject@@B @ 146 NONAME ; struct QMetaObject const RadioStationModel::staticMetaObject - ?addRecognizedSong@RadioUiEngine@@QAEXABVQString@@0ABVRadioStation@@@Z @ 147 NONAME ; void RadioUiEngine::addRecognizedSong(class QString const &, class QString const &, class RadioStation const &) - ?emitMuteChanged@RadioUiEngine@@AAEX_N@Z @ 148 NONAME ; void RadioUiEngine::emitMuteChanged(bool) - ?setDynamicPsText@RadioStation@@AAEXABVQString@@@Z @ 149 NONAME ; void RadioStation::setDynamicPsText(class QString const &) - ?currentSongReset@RadioHistoryModel@@IAEXXZ @ 150 NONAME ; void RadioHistoryModel::currentSongReset(void) - ?removeByPresetIndex@RadioStationModel@@QAEXH@Z @ 151 NONAME ; void RadioStationModel::removeByPresetIndex(int) - ?d_func@RadioScannerEngine@@AAEPAVRadioScannerEnginePrivate@@XZ @ 152 NONAME ; class RadioScannerEnginePrivate * RadioScannerEngine::d_func(void) - ?isRenamed@RadioStation@@QBE_NXZ @ 153 NONAME ; bool RadioStation::isRenamed(void) const - ?stationAt@RadioStationModel@@QBE?AVRadioStation@@H@Z @ 154 NONAME ; class RadioStation RadioStationModel::stationAt(int) const - ?removeStation@RadioStationModel@@QAEXABVRadioStation@@@Z @ 155 NONAME ; void RadioStationModel::removeStation(class RadioStation const &) - ?openMusicStore@RadioUiEngine@@QAEXABVRadioHistoryItem@@W4MusicStore@1@@Z @ 156 NONAME ; void RadioUiEngine::openMusicStore(class RadioHistoryItem const &, enum RadioUiEngine::MusicStore) - ?metaObject@RadioUiEngine@@UBEPBUQMetaObject@@XZ @ 157 NONAME ; struct QMetaObject const * RadioUiEngine::metaObject(void) const - ?dynamicPsChanged@RadioStationModel@@IAEXABVRadioStation@@@Z @ 158 NONAME ; void RadioStationModel::dynamicPsChanged(class RadioStation const &) - ?setType@RadioStation@@QAEXV?$QFlags@W4TypeFlag@RadioStation@@@@@Z @ 159 NONAME ; void RadioStation::setType(class QFlags) - ??0RadioHistoryItem@@QAE@XZ @ 160 NONAME ; RadioHistoryItem::RadioHistoryItem(void) - ?removeByFrequency@RadioStationModel@@QAEXI@Z @ 161 NONAME ; void RadioStationModel::removeByFrequency(unsigned int) - ?isUsingLoudspeaker@RadioUiEngine@@QBE_NXZ @ 162 NONAME ; bool RadioUiEngine::isUsingLoudspeaker(void) const - ?findPresetIndex@RadioStationModel@@QAEHH@Z @ 163 NONAME ; int RadioStationModel::findPresetIndex(int) - ??0RadioHistoryItem@@QAE@ABV0@@Z @ 164 NONAME ; RadioHistoryItem::RadioHistoryItem(class RadioHistoryItem const &) - ?metaObject@RadioStationModel@@UBEPBUQMetaObject@@XZ @ 165 NONAME ; struct QMetaObject const * RadioStationModel::metaObject(void) const - ?getStaticMetaObject@RadioStationModel@@SAABUQMetaObject@@XZ @ 166 NONAME ; struct QMetaObject const & RadioStationModel::getStaticMetaObject(void) - ?isPoweringOff@RadioUiEngine@@QBE_NXZ @ 167 NONAME ; bool RadioUiEngine::isPoweringOff(void) const - ?lastTunedFrequency@RadioUiEngine@@SAII@Z @ 168 NONAME ; unsigned int RadioUiEngine::lastTunedFrequency(unsigned int) - ?tr@RadioScannerEngine@@SA?AVQString@@PBD0@Z @ 169 NONAME ; class QString RadioScannerEngine::tr(char const *, char const *) - ?removeAll@RadioHistoryModel@@QAEX_N@Z @ 170 NONAME ; void RadioHistoryModel::removeAll(bool) - ?hasGenre@RadioStation@@QBE_NXZ @ 171 NONAME ; bool RadioStation::hasGenre(void) const - ?audioRouteChanged@RadioUiEngine@@IAEX_N@Z @ 172 NONAME ; void RadioUiEngine::audioRouteChanged(bool) - ?setPowerOn@RadioUiEngine@@QAEXXZ @ 173 NONAME ; void RadioUiEngine::setPowerOn(void) - ?tr@RadioHistoryModel@@SA?AVQString@@PBD0H@Z @ 174 NONAME ; class QString RadioHistoryModel::tr(char const *, char const *, int) - ?dynamicPsText@RadioStation@@QBE?AVQString@@XZ @ 175 NONAME ; class QString RadioStation::dynamicPsText(void) const - ?isFirstTimeStart@RadioUiEngine@@QAE_NXZ @ 176 NONAME ; bool RadioUiEngine::isFirstTimeStart(void) - ?setMute@RadioUiEngine@@QAEX_N@Z @ 177 NONAME ; void RadioUiEngine::setMute(bool) - ?setGenre@RadioStation@@AAEXH@Z @ 178 NONAME ; void RadioStation::setGenre(int) - ??0RadioScannerEngine@@QAE@AAVRadioUiEnginePrivate@@@Z @ 179 NONAME ; RadioScannerEngine::RadioScannerEngine(class RadioUiEnginePrivate &) - ?emitRadioStatusChanged@RadioUiEngine@@AAEX_N@Z @ 180 NONAME ; void RadioUiEngine::emitRadioStatusChanged(bool) - ??_ERadioUiEngine@@UAE@I@Z @ 181 NONAME ; RadioUiEngine::~RadioUiEngine(unsigned int) - ?init@RadioUiEngine@@QAE_NXZ @ 182 NONAME ; bool RadioUiEngine::init(void) - ?setRadioText@RadioStation@@AAEXABVQString@@@Z @ 183 NONAME ; void RadioStation::setRadioText(class QString const &) - ?changeFlags@RadioStation@@QBE?AV?$QFlags@W4ChangeFlag@RadioStation@@@@XZ @ 184 NONAME ; class QFlags RadioStation::changeFlags(void) const - ?findFrequency@RadioStationModel@@QBE_NIAAVRadioStation@@W4Criteria@FindCriteria@@@Z @ 185 NONAME ; bool RadioStationModel::findFrequency(unsigned int, class RadioStation &, enum FindCriteria::Criteria) const - ?d_func@RadioStationModel@@AAEPAVRadioStationModelPrivate@@XZ @ 186 NONAME ; class RadioStationModelPrivate * RadioStationModel::d_func(void) - ?addRadioTextPlus@RadioHistoryModel@@AAEXHABVQString@@ABVRadioStation@@@Z @ 187 NONAME ; void RadioHistoryModel::addRadioTextPlus(int, class QString const &, class RadioStation const &) - ?qt_metacast@RadioHistoryModel@@UAEPAXPBD@Z @ 188 NONAME ; void * RadioHistoryModel::qt_metacast(char const *) - ?setDetail@RadioStationModel@@QAEXV?$QFlags@W4DetailFlag@RadioStationModel@@@@@Z @ 189 NONAME ; void RadioStationModel::setDetail(class QFlags) - ??1RadioUiEngine@@UAE@XZ @ 190 NONAME ; RadioUiEngine::~RadioUiEngine(void) - ?tr@RadioHistoryModel@@SA?AVQString@@PBD0@Z @ 191 NONAME ; class QString RadioHistoryModel::tr(char const *, char const *) - ?time@RadioHistoryItem@@QBE?AVQString@@XZ @ 192 NONAME ; class QString RadioHistoryItem::time(void) const - ?reportChangedData@RadioHistoryModel@@AAEXHH@Z @ 193 NONAME ; void RadioHistoryModel::reportChangedData(int, int) - ?artist@RadioHistoryItem@@QBE?AVQString@@XZ @ 194 NONAME ; class QString RadioHistoryItem::artist(void) const - ?initialize@RadioStationModel@@QAEXPAVRadioPresetStorage@@PAVRadioEngineWrapper@@@Z @ 195 NONAME ; void RadioStationModel::initialize(class RadioPresetStorage *, class RadioEngineWrapper *) - ?isType@RadioStation@@QBE_NV?$QFlags@W4TypeFlag@RadioStation@@@@@Z @ 196 NONAME ; bool RadioStation::isType(class QFlags) const - ?resetCurrentSong@RadioHistoryModel@@QAEXXZ @ 197 NONAME ; void RadioHistoryModel::resetCurrentSong(void) - ?d_func@RadioHistoryModel@@ABEPBVRadioHistoryModelPrivate@@XZ @ 198 NONAME ; class RadioHistoryModelPrivate const * RadioHistoryModel::d_func(void) const - ?volumeChanged@RadioUiEngine@@IAEXH@Z @ 199 NONAME ; void RadioUiEngine::volumeChanged(int) - ?title@RadioHistoryItem@@QBE?AVQString@@XZ @ 200 NONAME ; class QString RadioHistoryItem::title(void) const - ?stationFound@RadioScannerEngine@@IAEXABVRadioStation@@@Z @ 201 NONAME ; void RadioScannerEngine::stationFound(class RadioStation const &) - ?resetChangeFlags@RadioStation@@QAEXXZ @ 202 NONAME ; void RadioStation::resetChangeFlags(void) - ?powerOffRequested@RadioUiEngine@@IAEXXZ @ 203 NONAME ; void RadioUiEngine::powerOffRequested(void) - ?metaObject@RadioScannerEngine@@UBEPBUQMetaObject@@XZ @ 204 NONAME ; struct QMetaObject const * RadioScannerEngine::metaObject(void) const - ?qt_metacast@RadioScannerEngine@@UAEPAXPBD@Z @ 205 NONAME ; void * RadioScannerEngine::qt_metacast(char const *) - ?setIcons@RadioStationModel@@QAEXABVQIcon@@00@Z @ 206 NONAME ; void RadioStationModel::setIcons(class QIcon const &, class QIcon const &, class QIcon const &) - ?callSignChar@RadioStation@@AAEDI@Z @ 207 NONAME ; char RadioStation::callSignChar(unsigned int) - ??_ERadioStation@@UAE@I@Z @ 208 NONAME ; RadioStation::~RadioStation(unsigned int) - ?antennaStatusChanged@RadioUiEngine@@IAEX_N@Z @ 209 NONAME ; void RadioUiEngine::antennaStatusChanged(bool) - ?staticMetaObject@RadioHistoryModel@@2UQMetaObject@@B @ 210 NONAME ; struct QMetaObject const RadioHistoryModel::staticMetaObject - ?setFirstTimeStartPerformed@RadioUiEngine@@QAEX_N@Z @ 211 NONAME ; void RadioUiEngine::setFirstTimeStartPerformed(bool) - ??0RadioStation@@AAE@HI@Z @ 212 NONAME ; RadioStation::RadioStation(int, unsigned int) - ?qt_metacall@RadioStationModel@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 213 NONAME ; int RadioStationModel::qt_metacall(enum QMetaObject::Call, int, void * *) - ?isDetached@RadioStation@@QBE_NXZ @ 214 NONAME ; bool RadioStation::isDetached(void) const - ??0RadioHistoryItem@@QAE@ABVQString@@0@Z @ 215 NONAME ; RadioHistoryItem::RadioHistoryItem(class QString const &, class QString const &) - ?name@RadioStation@@QBE?AVQString@@XZ @ 216 NONAME ; class QString RadioStation::name(void) const - ?hasDataChanged@RadioStation@@QBE_NV?$QFlags@W4ChangeFlag@RadioStation@@@@@Z @ 217 NONAME ; bool RadioStation::hasDataChanged(class QFlags) const - ?removeAll@RadioStationModel@@QAEXW4RemoveMode@1@@Z @ 218 NONAME ; void RadioStationModel::removeAll(enum RadioStationModel::RemoveMode) - ?data@RadioStationModel@@UBE?AVQVariant@@ABVQModelIndex@@H@Z @ 219 NONAME ; class QVariant RadioStationModel::data(class QModelIndex const &, int) const - ?itemAdded@RadioHistoryModel@@IAEXXZ @ 220 NONAME ; void RadioHistoryModel::itemAdded(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) - ?piCode@RadioStation@@QBEHXZ @ 227 NONAME ; int RadioStation::piCode(void) const - ?genreToString@RadioUiEngine@@QAE?AVQString@@HW4Target@GenreTarget@@@Z @ 228 NONAME ; class QString RadioUiEngine::genreToString(int, enum GenreTarget::Target) - ??0RadioUiEngine@@QAE@PAVQObject@@@Z @ 229 NONAME ; RadioUiEngine::RadioUiEngine(class QObject *) - ?hasRadiotext@RadioStation@@QBE_NXZ @ 230 NONAME ; bool RadioStation::hasRadiotext(void) const - ?setCurrentTime@RadioHistoryItem@@QAEXXZ @ 231 NONAME ; void RadioHistoryItem::setCurrentTime(void) - ?d_func@RadioUiEngine@@AAEPAVRadioUiEnginePrivate@@XZ @ 232 NONAME ; class RadioUiEnginePrivate * RadioUiEngine::d_func(void) - ?station@RadioHistoryItem@@QBE?AVQString@@XZ @ 233 NONAME ; class QString RadioHistoryItem::station(void) const - ??_ERadioHistoryModel@@UAE@I@Z @ 234 NONAME ; RadioHistoryModel::~RadioHistoryModel(unsigned int) - ?minFrequency@RadioUiEngine@@QBEIXZ @ 235 NONAME ; unsigned int RadioUiEngine::minFrequency(void) const - ?isTagged@RadioHistoryItem@@QBE_NXZ @ 236 NONAME ; bool RadioHistoryItem::isTagged(void) const - ?addScannedFrequency@RadioScannerEngine@@QAEXI@Z @ 237 NONAME ; void RadioScannerEngine::addScannedFrequency(unsigned int) - ?setShowTagged@RadioHistoryModel@@QAEX_N@Z @ 238 NONAME ; void RadioHistoryModel::setShowTagged(bool) - ?setPresetIndex@RadioStation@@AAEXH@Z @ 239 NONAME ; void RadioStation::setPresetIndex(int) - ?setName@RadioStation@@AAEXABVQString@@@Z @ 240 NONAME ; void RadioStation::setName(class QString const &) - ?trUtf8@RadioHistoryModel@@SA?AVQString@@PBD0@Z @ 241 NONAME ; class QString RadioHistoryModel::trUtf8(char const *, char const *) - ?frequencyStepSize@RadioUiEngine@@QBEIXZ @ 242 NONAME ; unsigned int RadioUiEngine::frequencyStepSize(void) const - ??0RadioHistoryModel@@AAE@AAVRadioUiEngine@@@Z @ 243 NONAME ; RadioHistoryModel::RadioHistoryModel(class RadioUiEngine &) - ?trUtf8@RadioStationModel@@SA?AVQString@@PBD0H@Z @ 244 NONAME ; class QString RadioStationModel::trUtf8(char const *, char const *, int) - ?radioTextReceived@RadioStationModel@@IAEXABVRadioStation@@@Z @ 245 NONAME ; void RadioStationModel::radioTextReceived(class RadioStation const &) - ?isFavorite@RadioStation@@QBE_NXZ @ 246 NONAME ; bool RadioStation::isFavorite(void) const - ?metaObject@RadioHistoryModel@@UBEPBUQMetaObject@@XZ @ 247 NONAME ; struct QMetaObject const * RadioHistoryModel::metaObject(void) const - ?seekingStarted@RadioUiEngine@@IAEXH@Z @ 248 NONAME ; void RadioUiEngine::seekingStarted(int) - ?emitSeekingStarted@RadioUiEngine@@AAEXW4Direction@Seek@@@Z @ 249 NONAME ; void RadioUiEngine::emitSeekingStarted(enum Seek::Direction) - ?isRecognizedByRds@RadioHistoryItem@@QBE_NXZ @ 250 NONAME ; bool RadioHistoryItem::isRecognizedByRds(void) const - ?setFavorites@RadioStationModel@@QAEXABV?$QList@VQModelIndex@@@@@Z @ 251 NONAME ; void RadioStationModel::setFavorites(class QList const &) - ?setArtist@RadioHistoryItem@@QAEXABVQString@@@Z @ 252 NONAME ; void RadioHistoryItem::setArtist(class QString const &) - ??_ERadioStationModel@@UAE@I@Z @ 253 NONAME ; RadioStationModel::~RadioStationModel(unsigned int) - ?setTitle@RadioHistoryItem@@QAEXABVQString@@@Z @ 254 NONAME ; void RadioHistoryItem::setTitle(class QString const &) + ?removeByModelIndices@RadioHistoryModel@@QAEXAAV?$QList@VQModelIndex@@@@_N@Z @ 72 NONAME ; void RadioHistoryModel::removeByModelIndices(class QList &, bool) + ?localCount@RadioStationModel@@QAEHXZ @ 73 NONAME ; int RadioStationModel::localCount(void) + ?list@RadioStationModel@@QBEABV?$QMap@IVRadioStation@@@@XZ @ 74 NONAME ; class QMap const & RadioStationModel::list(void) const + ?tr@RadioStationModel@@SA?AVQString@@PBD0@Z @ 75 NONAME ; class QString RadioStationModel::tr(char const *, char 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 RadioStationModel::flags(class QModelIndex const &) const + ?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 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) + ?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 & 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) + ?lastVolume@RadioUiEngine@@SAHXZ @ 88 NONAME ; int RadioUiEngine::lastVolume(void) + ?isInManualSeekMode@RadioUiEngine@@QBE_NXZ @ 89 NONAME ; bool RadioUiEngine::isInManualSeekMode(void) const + ?itemAtIndex@RadioHistoryModel@@QBE?AVRadioHistoryItem@@ABVQModelIndex@@@Z @ 90 NONAME ; class RadioHistoryItem RadioHistoryModel::itemAtIndex(class QModelIndex const &) const + ?setVolume@RadioUiEngine@@QAEXH@Z @ 91 NONAME ; void RadioUiEngine::setVolume(int) + ?setFavorite@RadioStation@@QAEX_N@Z @ 92 NONAME ; void RadioStation::setFavorite(bool) + ?d_func@RadioStationModel@@ABEPBVRadioStationModelPrivate@@XZ @ 93 NONAME ; class RadioStationModelPrivate const * RadioStationModel::d_func(void) const + ?emitChangeSignals@RadioStationModel@@AAEXABVRadioStation@@V?$QFlags@W4ChangeFlag@RadioStation@@@@@Z @ 94 NONAME ; void RadioStationModel::emitChangeSignals(class RadioStation const &, class QFlags) + ?tr@RadioStationModel@@SA?AVQString@@PBD0H@Z @ 95 NONAME ; class QString RadioStationModel::tr(char const *, char const *, int) + ?hasUrl@RadioStation@@QBE_NXZ @ 96 NONAME ; bool RadioStation::hasUrl(void) const + ??1RadioStationModel@@UAE@XZ @ 97 NONAME ; RadioStationModel::~RadioStationModel(void) + ?isMuted@RadioUiEngine@@QBE_NXZ @ 98 NONAME ; bool RadioUiEngine::isMuted(void) const + ?renameStation@RadioStationModel@@QAEXHABVQString@@@Z @ 99 NONAME ; void RadioStationModel::renameStation(int, class QString const &) + ?currentFrequency@RadioUiEngine@@QBEIXZ @ 100 NONAME ; unsigned int RadioUiEngine::currentFrequency(void) const + ?emitItemAdded@RadioHistoryModel@@AAEXXZ @ 101 NONAME ; void RadioHistoryModel::emitItemAdded(void) + ?setUserDefinedName@RadioStation@@QAEXABVQString@@@Z @ 102 NONAME ; void RadioStation::setUserDefinedName(class QString const &) + ?setUrl@RadioStation@@AAEXABVQString@@@Z @ 103 NONAME ; void RadioStation::setUrl(class QString const &) + ?hasDynamicPs@RadioStation@@QBE_NXZ @ 104 NONAME ; bool RadioStation::hasDynamicPs(void) const + ??1RadioStation@@UAE@XZ @ 105 NONAME ; RadioStation::~RadioStation(void) + ?getStaticMetaObject@RadioScannerEngine@@SAABUQMetaObject@@XZ @ 106 NONAME ; struct QMetaObject const & RadioScannerEngine::getStaticMetaObject(void) + ?callSignString@RadioStation@@AAE?AVQString@@I@Z @ 107 NONAME ; class QString RadioStation::callSignString(unsigned int) + ?isValid@RadioStation@@QBE_NXZ @ 108 NONAME ; bool RadioStation::isValid(void) const + ?data_ptr@RadioStation@@QAEAAV?$QSharedDataPointer@VRadioStationPrivate@@@@XZ @ 109 NONAME ; class QSharedDataPointer & RadioStation::data_ptr(void) + ?trUtf8@RadioUiEngine@@SA?AVQString@@PBD0H@Z @ 110 NONAME ; class QString RadioUiEngine::trUtf8(char const *, char const *, int) + ?reset@RadioHistoryItem@@QAEXXZ @ 111 NONAME ; void RadioHistoryItem::reset(void) + ?trUtf8@RadioStationModel@@SA?AVQString@@PBD0@Z @ 112 NONAME ; class QString RadioStationModel::trUtf8(char const *, char const *) + ?setRadioTextPlus@RadioStation@@AAEXHABVQString@@@Z @ 113 NONAME ; void RadioStation::setRadioTextPlus(int, class QString const &) + ?setChangeFlags@RadioStation@@AAEXV?$QFlags@W4ChangeFlag@RadioStation@@@@@Z @ 114 NONAME ; void RadioStation::setChangeFlags(class QFlags) + ??0RadioStationModel@@QAE@AAVRadioUiEnginePrivate@@@Z @ 115 NONAME ; RadioStationModel::RadioStationModel(class RadioUiEnginePrivate &) + ?stationDataChanged@RadioStationModel@@IAEXABVRadioStation@@@Z @ 116 NONAME ; void RadioStationModel::stationDataChanged(class RadioStation const &) + ?frequency@RadioHistoryItem@@QBEIXZ @ 117 NONAME ; unsigned int RadioHistoryItem::frequency(void) const + ?currentStation@RadioStationModel@@QAEAAVRadioStation@@XZ @ 118 NONAME ; class RadioStation & RadioStationModel::currentStation(void) + ?isDetached@RadioHistoryItem@@QBE_NXZ @ 119 NONAME ; bool RadioHistoryItem::isDetached(void) const + ?genre@RadioStation@@QBEHXZ @ 120 NONAME ; int RadioStation::genre(void) const + ?qt_metacall@RadioScannerEngine@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 121 NONAME ; int RadioScannerEngine::qt_metacall(enum QMetaObject::Call, int, void * *) + ?emitTunedToFrequency@RadioUiEngine@@AAEXIH@Z @ 122 NONAME ; void RadioUiEngine::emitTunedToFrequency(unsigned int, int) + ??0RadioStation@@QAE@XZ @ 123 NONAME ; RadioStation::RadioStation(void) + ?psType@RadioStation@@QBE?AV?$QFlags@W4PsTypeFlag@RadioStation@@@@XZ @ 124 NONAME ; class QFlags RadioStation::psType(void) const + ??1RadioHistoryModel@@UAE@XZ @ 125 NONAME ; RadioHistoryModel::~RadioHistoryModel(void) + ?d_func@RadioUiEngine@@ABEPBVRadioUiEnginePrivate@@XZ @ 126 NONAME ; class RadioUiEnginePrivate const * RadioUiEngine::d_func(void) const + ?findStation@RadioStationModel@@QBE?AVRadioStation@@IW4Criteria@FindCriteria@@@Z @ 127 NONAME ; class RadioStation RadioStationModel::findStation(unsigned int, enum FindCriteria::Criteria) const + ?scannerEngine@RadioUiEngine@@QAEPAVRadioScannerEngine@@XZ @ 128 NONAME ; class RadioScannerEngine * RadioUiEngine::scannerEngine(void) + ?setManualSeekMode@RadioUiEngine@@QAEX_N@Z @ 129 NONAME ; void RadioUiEngine::setManualSeekMode(bool) + ?isSongRecognitionAppAvailable@RadioUiEngine@@QAE_NXZ @ 130 NONAME ; bool RadioUiEngine::isSongRecognitionAppAvailable(void) + ?startScanning@RadioScannerEngine@@QAEXXZ @ 131 NONAME ; void RadioScannerEngine::startScanning(void) + ?emitStationFound@RadioScannerEngine@@AAEXABVRadioStation@@@Z @ 132 NONAME ; void RadioScannerEngine::emitStationFound(class RadioStation const &) + ?isValid@RadioHistoryItem@@QBE_NXZ @ 133 NONAME ; bool RadioHistoryItem::isValid(void) const + ?setPsType@RadioStation@@AAEXV?$QFlags@W4PsTypeFlag@RadioStation@@@@@Z @ 134 NONAME ; void RadioStation::setPsType(class QFlags) + ?setFrequency@RadioUiEngine@@QAEXIH@Z @ 135 NONAME ; void RadioUiEngine::setFrequency(unsigned int, int) + ?data@RadioHistoryModel@@UBE?AVQVariant@@ABVQModelIndex@@H@Z @ 136 NONAME ; class QVariant RadioHistoryModel::data(class QModelIndex const &, int) const + ??4RadioHistoryItem@@QAEAAV0@ABV0@@Z @ 137 NONAME ; class RadioHistoryItem & RadioHistoryItem::operator=(class RadioHistoryItem const &) + ?url@RadioStation@@QBE?AVQString@@XZ @ 138 NONAME ; class QString RadioStation::url(void) const + ?historyModel@RadioUiEngine@@QAEAAVRadioHistoryModel@@XZ @ 139 NONAME ; class RadioHistoryModel & RadioUiEngine::historyModel(void) + ?emitRdsAvailabilityChanged@RadioUiEngine@@AAEX_N@Z @ 140 NONAME ; void RadioUiEngine::emitRdsAvailabilityChanged(bool) + ?isAntennaAttached@RadioUiEngine@@QBE_NXZ @ 141 NONAME ; bool RadioUiEngine::isAntennaAttached(void) const + ?setStation@RadioHistoryItem@@QAEXABVQString@@@Z @ 142 NONAME ; void RadioHistoryItem::setStation(class QString const &) + ?removeByModelIndices@RadioStationModel@@QAEXAAV?$QList@VQModelIndex@@@@_N@Z @ 143 NONAME ; void RadioStationModel::removeByModelIndices(class QList &, bool) + ?qt_metacast@RadioStationModel@@UAEPAXPBD@Z @ 144 NONAME ; void * RadioStationModel::qt_metacast(char const *) + ?hasSentRds@RadioStation@@QBE_NXZ @ 145 NONAME ; bool RadioStation::hasSentRds(void) const + ?presetIndex@RadioStation@@QBEHXZ @ 146 NONAME ; int RadioStation::presetIndex(void) const + ?cancel@RadioScannerEngine@@QAEXXZ @ 147 NONAME ; void RadioScannerEngine::cancel(void) + ?staticMetaObject@RadioStationModel@@2UQMetaObject@@B @ 148 NONAME ; struct QMetaObject const RadioStationModel::staticMetaObject + ?addRecognizedSong@RadioUiEngine@@QAEXABVQString@@0ABVRadioStation@@@Z @ 149 NONAME ; void RadioUiEngine::addRecognizedSong(class QString const &, class QString const &, class RadioStation const &) + ?emitMuteChanged@RadioUiEngine@@AAEX_N@Z @ 150 NONAME ; void RadioUiEngine::emitMuteChanged(bool) + ?setDynamicPsText@RadioStation@@AAEXABVQString@@@Z @ 151 NONAME ; void RadioStation::setDynamicPsText(class QString const &) + ?currentSongReset@RadioHistoryModel@@IAEXXZ @ 152 NONAME ; void RadioHistoryModel::currentSongReset(void) + ?removeByPresetIndex@RadioStationModel@@QAEXH@Z @ 153 NONAME ; void RadioStationModel::removeByPresetIndex(int) + ?d_func@RadioScannerEngine@@AAEPAVRadioScannerEnginePrivate@@XZ @ 154 NONAME ; class RadioScannerEnginePrivate * RadioScannerEngine::d_func(void) + ?isRenamed@RadioStation@@QBE_NXZ @ 155 NONAME ; bool RadioStation::isRenamed(void) const + ?stationAt@RadioStationModel@@QBE?AVRadioStation@@H@Z @ 156 NONAME ; class RadioStation RadioStationModel::stationAt(int) const + ?removeStation@RadioStationModel@@QAEXABVRadioStation@@@Z @ 157 NONAME ; void RadioStationModel::removeStation(class RadioStation const &) + ?openMusicStore@RadioUiEngine@@QAEXABVRadioHistoryItem@@W4MusicStore@1@@Z @ 158 NONAME ; void RadioUiEngine::openMusicStore(class RadioHistoryItem const &, enum RadioUiEngine::MusicStore) + ?metaObject@RadioUiEngine@@UBEPBUQMetaObject@@XZ @ 159 NONAME ; struct QMetaObject const * RadioUiEngine::metaObject(void) const + ?dynamicPsChanged@RadioStationModel@@IAEXABVRadioStation@@@Z @ 160 NONAME ; void RadioStationModel::dynamicPsChanged(class RadioStation const &) + ?setType@RadioStation@@QAEXV?$QFlags@W4TypeFlag@RadioStation@@@@@Z @ 161 NONAME ; void RadioStation::setType(class QFlags) + ??0RadioHistoryItem@@QAE@XZ @ 162 NONAME ; RadioHistoryItem::RadioHistoryItem(void) + ?removeByFrequency@RadioStationModel@@QAEXI@Z @ 163 NONAME ; void RadioStationModel::removeByFrequency(unsigned int) + ?isUsingLoudspeaker@RadioUiEngine@@QBE_NXZ @ 164 NONAME ; bool RadioUiEngine::isUsingLoudspeaker(void) const + ?findPresetIndex@RadioStationModel@@QAEHH@Z @ 165 NONAME ; int RadioStationModel::findPresetIndex(int) + ??0RadioHistoryItem@@QAE@ABV0@@Z @ 166 NONAME ; RadioHistoryItem::RadioHistoryItem(class RadioHistoryItem const &) + ?metaObject@RadioStationModel@@UBEPBUQMetaObject@@XZ @ 167 NONAME ; struct QMetaObject const * RadioStationModel::metaObject(void) const + ?getStaticMetaObject@RadioStationModel@@SAABUQMetaObject@@XZ @ 168 NONAME ; struct QMetaObject const & RadioStationModel::getStaticMetaObject(void) + ?isPoweringOff@RadioUiEngine@@QBE_NXZ @ 169 NONAME ; bool RadioUiEngine::isPoweringOff(void) const + ?lastTunedFrequency@RadioUiEngine@@SAII@Z @ 170 NONAME ; unsigned int RadioUiEngine::lastTunedFrequency(unsigned int) + ?tr@RadioScannerEngine@@SA?AVQString@@PBD0@Z @ 171 NONAME ; class QString RadioScannerEngine::tr(char const *, char const *) + ?removeAll@RadioHistoryModel@@QAEX_N@Z @ 172 NONAME ; void RadioHistoryModel::removeAll(bool) + ?hasGenre@RadioStation@@QBE_NXZ @ 173 NONAME ; bool RadioStation::hasGenre(void) const + ?audioRouteChanged@RadioUiEngine@@IAEX_N@Z @ 174 NONAME ; void RadioUiEngine::audioRouteChanged(bool) + ?setPowerOn@RadioUiEngine@@QAEXXZ @ 175 NONAME ; void RadioUiEngine::setPowerOn(void) + ?tr@RadioHistoryModel@@SA?AVQString@@PBD0H@Z @ 176 NONAME ; class QString RadioHistoryModel::tr(char const *, char const *, int) + ?dynamicPsText@RadioStation@@QBE?AVQString@@XZ @ 177 NONAME ; class QString RadioStation::dynamicPsText(void) const + ?isFirstTimeStart@RadioUiEngine@@QAE_NXZ @ 178 NONAME ; bool RadioUiEngine::isFirstTimeStart(void) + ?setMute@RadioUiEngine@@QAEX_N@Z @ 179 NONAME ; void RadioUiEngine::setMute(bool) + ?setGenre@RadioStation@@AAEXH@Z @ 180 NONAME ; void RadioStation::setGenre(int) + ??0RadioScannerEngine@@QAE@AAVRadioUiEnginePrivate@@@Z @ 181 NONAME ; RadioScannerEngine::RadioScannerEngine(class RadioUiEnginePrivate &) + ?emitRadioStatusChanged@RadioUiEngine@@AAEX_N@Z @ 182 NONAME ; void RadioUiEngine::emitRadioStatusChanged(bool) + ??_ERadioUiEngine@@UAE@I@Z @ 183 NONAME ; RadioUiEngine::~RadioUiEngine(unsigned int) + ?init@RadioUiEngine@@QAE_NXZ @ 184 NONAME ; bool RadioUiEngine::init(void) + ?setRadioText@RadioStation@@AAEXABVQString@@@Z @ 185 NONAME ; void RadioStation::setRadioText(class QString const &) + ?changeFlags@RadioStation@@QBE?AV?$QFlags@W4ChangeFlag@RadioStation@@@@XZ @ 186 NONAME ; class QFlags RadioStation::changeFlags(void) const + ?findFrequency@RadioStationModel@@QBE_NIAAVRadioStation@@W4Criteria@FindCriteria@@@Z @ 187 NONAME ; bool RadioStationModel::findFrequency(unsigned int, class RadioStation &, enum FindCriteria::Criteria) const + ?d_func@RadioStationModel@@AAEPAVRadioStationModelPrivate@@XZ @ 188 NONAME ; class RadioStationModelPrivate * RadioStationModel::d_func(void) + ?addRadioTextPlus@RadioHistoryModel@@AAEXHABVQString@@ABVRadioStation@@@Z @ 189 NONAME ; void RadioHistoryModel::addRadioTextPlus(int, class QString const &, class RadioStation const &) + ?qt_metacast@RadioHistoryModel@@UAEPAXPBD@Z @ 190 NONAME ; void * RadioHistoryModel::qt_metacast(char const *) + ?setDetail@RadioStationModel@@QAEXV?$QFlags@W4DetailFlag@RadioStationModel@@@@@Z @ 191 NONAME ; void RadioStationModel::setDetail(class QFlags) + ??1RadioUiEngine@@UAE@XZ @ 192 NONAME ; RadioUiEngine::~RadioUiEngine(void) + ?tr@RadioHistoryModel@@SA?AVQString@@PBD0@Z @ 193 NONAME ; class QString RadioHistoryModel::tr(char const *, char const *) + ?time@RadioHistoryItem@@QBE?AVQString@@XZ @ 194 NONAME ; class QString RadioHistoryItem::time(void) const + ?reportChangedData@RadioHistoryModel@@AAEXHH@Z @ 195 NONAME ; void RadioHistoryModel::reportChangedData(int, int) + ?artist@RadioHistoryItem@@QBE?AVQString@@XZ @ 196 NONAME ; class QString RadioHistoryItem::artist(void) const + ?initialize@RadioStationModel@@QAEXPAVRadioPresetStorage@@PAVRadioEngineWrapper@@@Z @ 197 NONAME ; void RadioStationModel::initialize(class RadioPresetStorage *, class RadioEngineWrapper *) + ?isType@RadioStation@@QBE_NV?$QFlags@W4TypeFlag@RadioStation@@@@@Z @ 198 NONAME ; bool RadioStation::isType(class QFlags) const + ?resetCurrentSong@RadioHistoryModel@@QAEXXZ @ 199 NONAME ; void RadioHistoryModel::resetCurrentSong(void) + ?d_func@RadioHistoryModel@@ABEPBVRadioHistoryModelPrivate@@XZ @ 200 NONAME ; class RadioHistoryModelPrivate const * RadioHistoryModel::d_func(void) const + ?volumeChanged@RadioUiEngine@@IAEXH@Z @ 201 NONAME ; void RadioUiEngine::volumeChanged(int) + ?title@RadioHistoryItem@@QBE?AVQString@@XZ @ 202 NONAME ; class QString RadioHistoryItem::title(void) const + ?stationFound@RadioScannerEngine@@IAEXABVRadioStation@@@Z @ 203 NONAME ; void RadioScannerEngine::stationFound(class RadioStation const &) + ?resetChangeFlags@RadioStation@@QAEXXZ @ 204 NONAME ; void RadioStation::resetChangeFlags(void) + ?powerOffRequested@RadioUiEngine@@IAEXXZ @ 205 NONAME ; void RadioUiEngine::powerOffRequested(void) + ?metaObject@RadioScannerEngine@@UBEPBUQMetaObject@@XZ @ 206 NONAME ; struct QMetaObject const * RadioScannerEngine::metaObject(void) const + ?qt_metacast@RadioScannerEngine@@UAEPAXPBD@Z @ 207 NONAME ; void * RadioScannerEngine::qt_metacast(char const *) + ?setIcons@RadioStationModel@@QAEXABVQIcon@@00@Z @ 208 NONAME ; void RadioStationModel::setIcons(class QIcon const &, class QIcon const &, class QIcon const &) + ?callSignChar@RadioStation@@AAEDI@Z @ 209 NONAME ; char RadioStation::callSignChar(unsigned int) + ??_ERadioStation@@UAE@I@Z @ 210 NONAME ; RadioStation::~RadioStation(unsigned int) + ?antennaStatusChanged@RadioUiEngine@@IAEX_N@Z @ 211 NONAME ; void RadioUiEngine::antennaStatusChanged(bool) + ?staticMetaObject@RadioHistoryModel@@2UQMetaObject@@B @ 212 NONAME ; struct QMetaObject const RadioHistoryModel::staticMetaObject + ?setFirstTimeStartPerformed@RadioUiEngine@@QAEX_N@Z @ 213 NONAME ; void RadioUiEngine::setFirstTimeStartPerformed(bool) + ??0RadioStation@@AAE@HI@Z @ 214 NONAME ; RadioStation::RadioStation(int, unsigned int) + ?qt_metacall@RadioStationModel@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 215 NONAME ; int RadioStationModel::qt_metacall(enum QMetaObject::Call, int, void * *) + ?isDetached@RadioStation@@QBE_NXZ @ 216 NONAME ; bool RadioStation::isDetached(void) const + ??0RadioHistoryItem@@QAE@ABVQString@@0@Z @ 217 NONAME ; RadioHistoryItem::RadioHistoryItem(class QString const &, class QString const &) + ?name@RadioStation@@QBE?AVQString@@XZ @ 218 NONAME ; class QString RadioStation::name(void) const + ?hasDataChanged@RadioStation@@QBE_NV?$QFlags@W4ChangeFlag@RadioStation@@@@@Z @ 219 NONAME ; bool RadioStation::hasDataChanged(class QFlags) const + ?removeAll@RadioStationModel@@QAEXW4RemoveMode@1@@Z @ 220 NONAME ; void RadioStationModel::removeAll(enum RadioStationModel::RemoveMode) + ?data@RadioStationModel@@UBE?AVQVariant@@ABVQModelIndex@@H@Z @ 221 NONAME ; class QVariant RadioStationModel::data(class QModelIndex const &, int) const + ?itemAdded@RadioHistoryModel@@IAEXXZ @ 222 NONAME ; void RadioHistoryModel::itemAdded(void) + ?getStaticMetaObject@RadioUiEngine@@SAABUQMetaObject@@XZ @ 223 NONAME ; struct QMetaObject const & RadioUiEngine::getStaticMetaObject(void) + ?setShowDetails@RadioHistoryModel@@QAEX_N@Z @ 224 NONAME ; void RadioHistoryModel::setShowDetails(bool) + ?launchSongRecognition@RadioUiEngine@@QAEXXZ @ 225 NONAME ; void RadioUiEngine::launchSongRecognition(void) + ?rowCount@RadioStationModel@@UBEHABVQModelIndex@@@Z @ 226 NONAME ; int RadioStationModel::rowCount(class QModelIndex const &) const + ?iterateCallSign@RadioStation@@AAE?AVQString@@HH@Z @ 227 NONAME ; class QString RadioStation::iterateCallSign(int, int) + ?toggleMute@RadioUiEngine@@QAEXXZ @ 228 NONAME ; void RadioUiEngine::toggleMute(void) + ?piCode@RadioStation@@QBEHXZ @ 229 NONAME ; int RadioStation::piCode(void) const + ?genreToString@RadioUiEngine@@QAE?AVQString@@HW4Target@GenreTarget@@@Z @ 230 NONAME ; class QString RadioUiEngine::genreToString(int, enum GenreTarget::Target) + ??0RadioUiEngine@@QAE@PAVQObject@@@Z @ 231 NONAME ; RadioUiEngine::RadioUiEngine(class QObject *) + ?hasRadiotext@RadioStation@@QBE_NXZ @ 232 NONAME ; bool RadioStation::hasRadiotext(void) const + ?setCurrentTime@RadioHistoryItem@@QAEXXZ @ 233 NONAME ; void RadioHistoryItem::setCurrentTime(void) + ?d_func@RadioUiEngine@@AAEPAVRadioUiEnginePrivate@@XZ @ 234 NONAME ; class RadioUiEnginePrivate * RadioUiEngine::d_func(void) + ?station@RadioHistoryItem@@QBE?AVQString@@XZ @ 235 NONAME ; class QString RadioHistoryItem::station(void) const + ??_ERadioHistoryModel@@UAE@I@Z @ 236 NONAME ; RadioHistoryModel::~RadioHistoryModel(unsigned int) + ?minFrequency@RadioUiEngine@@QBEIXZ @ 237 NONAME ; unsigned int RadioUiEngine::minFrequency(void) const + ?isTagged@RadioHistoryItem@@QBE_NXZ @ 238 NONAME ; bool RadioHistoryItem::isTagged(void) const + ?addScannedFrequency@RadioScannerEngine@@QAEXI@Z @ 239 NONAME ; void RadioScannerEngine::addScannedFrequency(unsigned int) + ?setShowTagged@RadioHistoryModel@@QAEX_N@Z @ 240 NONAME ; void RadioHistoryModel::setShowTagged(bool) + ?setPresetIndex@RadioStation@@AAEXH@Z @ 241 NONAME ; void RadioStation::setPresetIndex(int) + ?setName@RadioStation@@AAEXABVQString@@@Z @ 242 NONAME ; void RadioStation::setName(class QString const &) + ?trUtf8@RadioHistoryModel@@SA?AVQString@@PBD0@Z @ 243 NONAME ; class QString RadioHistoryModel::trUtf8(char const *, char const *) + ?frequencyStepSize@RadioUiEngine@@QBEIXZ @ 244 NONAME ; unsigned int RadioUiEngine::frequencyStepSize(void) const + ??0RadioHistoryModel@@AAE@AAVRadioUiEngine@@@Z @ 245 NONAME ; RadioHistoryModel::RadioHistoryModel(class RadioUiEngine &) + ?trUtf8@RadioStationModel@@SA?AVQString@@PBD0H@Z @ 246 NONAME ; class QString RadioStationModel::trUtf8(char const *, char const *, int) + ?radioTextReceived@RadioStationModel@@IAEXABVRadioStation@@@Z @ 247 NONAME ; void RadioStationModel::radioTextReceived(class RadioStation const &) + ?isFavorite@RadioStation@@QBE_NXZ @ 248 NONAME ; bool RadioStation::isFavorite(void) const + ?metaObject@RadioHistoryModel@@UBEPBUQMetaObject@@XZ @ 249 NONAME ; struct QMetaObject const * RadioHistoryModel::metaObject(void) const + ?seekingStarted@RadioUiEngine@@IAEXH@Z @ 250 NONAME ; void RadioUiEngine::seekingStarted(int) + ?emitSeekingStarted@RadioUiEngine@@AAEXW4Direction@Seek@@@Z @ 251 NONAME ; void RadioUiEngine::emitSeekingStarted(enum Seek::Direction) + ?isRecognizedByRds@RadioHistoryItem@@QBE_NXZ @ 252 NONAME ; bool RadioHistoryItem::isRecognizedByRds(void) const + ?setFavorites@RadioStationModel@@QAEXABV?$QList@VQModelIndex@@@@@Z @ 253 NONAME ; void RadioStationModel::setFavorites(class QList const &) + ?setArtist@RadioHistoryItem@@QAEXABVQString@@@Z @ 254 NONAME ; void RadioHistoryItem::setArtist(class QString const &) + ??_ERadioStationModel@@UAE@I@Z @ 255 NONAME ; RadioStationModel::~RadioStationModel(unsigned int) + ?setTitle@RadioHistoryItem@@QAEXABVQString@@@Z @ 256 NONAME ; void RadioHistoryItem::setTitle(class QString const &) diff -r bbebb0235466 -r a8ba0c289b44 radioapp/eabi/fmradiouiengineu.def --- a/radioapp/eabi/fmradiouiengineu.def Mon Sep 20 18:04:48 2010 +0300 +++ b/radioapp/eabi/fmradiouiengineu.def Tue Oct 05 09:31:22 2010 +0300 @@ -113,138 +113,140 @@ _ZN17RadioHistoryModel17reportChangedDataEii @ 112 NONAME _ZN17RadioHistoryModel18clearRadioTextPlusEv @ 113 NONAME _ZN17RadioHistoryModel19getStaticMetaObjectEv @ 114 NONAME - _ZN17RadioHistoryModel7addItemERK7QStringS2_RK12RadioStation @ 115 NONAME - _ZN17RadioHistoryModel8setIconsERK5QIconS2_ @ 116 NONAME - _ZN17RadioHistoryModel9itemAddedEv @ 117 NONAME - _ZN17RadioHistoryModel9removeAllEb @ 118 NONAME - _ZN17RadioHistoryModelC1ER13RadioUiEngine @ 119 NONAME - _ZN17RadioHistoryModelC2ER13RadioUiEngine @ 120 NONAME - _ZN17RadioHistoryModelD0Ev @ 121 NONAME - _ZN17RadioHistoryModelD1Ev @ 122 NONAME - _ZN17RadioHistoryModelD2Ev @ 123 NONAME - _ZN17RadioStationModel10addStationERK12RadioStation @ 124 NONAME - _ZN17RadioStationModel10initializeEP18RadioPresetStorageP18RadioEngineWrapper @ 125 NONAME - _ZN17RadioStationModel10localCountEv @ 126 NONAME - _ZN17RadioStationModel11findClosestEjN11StationSkip4ModeE @ 127 NONAME - _ZN17RadioStationModel11qt_metacallEN11QMetaObject4CallEiPPv @ 128 NONAME - _ZN17RadioStationModel11qt_metacastEPKc @ 129 NONAME - _ZN17RadioStationModel11saveStationER12RadioStation @ 130 NONAME - _ZN17RadioStationModel12setFavoritesERK5QListI11QModelIndexE @ 131 NONAME - _ZN17RadioStationModel13favoriteCountEv @ 132 NONAME - _ZN17RadioStationModel13removeStationERK12RadioStation @ 133 NONAME - _ZN17RadioStationModel13renameStationEiRK7QString @ 134 NONAME - _ZN17RadioStationModel14currentStationEv @ 135 NONAME - _ZN17RadioStationModel15emitDataChangedERK12RadioStation @ 136 NONAME - _ZN17RadioStationModel15favoriteChangedERK12RadioStation @ 137 NONAME - _ZN17RadioStationModel15findPresetIndexEi @ 138 NONAME - _ZN17RadioStationModel15findPresetIndexEiR12RadioStation @ 139 NONAME - _ZN17RadioStationModel15stationsInRangeEjj @ 140 NONAME - _ZN17RadioStationModel16dynamicPsChangedERK12RadioStation @ 141 NONAME - _ZN17RadioStationModel16staticMetaObjectE @ 142 NONAME DATA 16 - _ZN17RadioStationModel16stationHandlerIfEv @ 143 NONAME - _ZN17RadioStationModel17emitChangeSignalsERK12RadioStation6QFlagsINS0_10ChangeFlagEE @ 144 NONAME - _ZN17RadioStationModel17radioTextReceivedERK12RadioStation @ 145 NONAME - _ZN17RadioStationModel17removeByFrequencyEj @ 146 NONAME - _ZN17RadioStationModel18indexFromFrequencyEj @ 147 NONAME - _ZN17RadioStationModel18stationDataChangedERK12RadioStation @ 148 NONAME - _ZN17RadioStationModel19dynamicPsCheckEndedEv @ 149 NONAME - _ZN17RadioStationModel19getStaticMetaObjectEv @ 150 NONAME - _ZN17RadioStationModel19removeByPresetIndexEi @ 151 NONAME - _ZN17RadioStationModel19setFavoriteByPresetEib @ 152 NONAME - _ZN17RadioStationModel21findUnusedPresetIndexEv @ 153 NONAME - _ZN17RadioStationModel22setFavoriteByFrequencyEjb @ 154 NONAME - _ZN17RadioStationModel7setDataERK11QModelIndexRK8QVarianti @ 155 NONAME - _ZN17RadioStationModel8setIconsERK5QIconS2_S2_ @ 156 NONAME - _ZN17RadioStationModel9removeAllENS_10RemoveModeE @ 157 NONAME - _ZN17RadioStationModel9setDetailE6QFlagsINS_10DetailFlagEE @ 158 NONAME - _ZN17RadioStationModelC1ER20RadioUiEnginePrivate @ 159 NONAME - _ZN17RadioStationModelC2ER20RadioUiEnginePrivate @ 160 NONAME - _ZN17RadioStationModelD0Ev @ 161 NONAME - _ZN17RadioStationModelD1Ev @ 162 NONAME - _ZN17RadioStationModelD2Ev @ 163 NONAME - _ZN18RadioScannerEngine11qt_metacallEN11QMetaObject4CallEiPPv @ 164 NONAME - _ZN18RadioScannerEngine11qt_metacastEPKc @ 165 NONAME - _ZN18RadioScannerEngine12stationFoundERK12RadioStation @ 166 NONAME - _ZN18RadioScannerEngine13startScanningEv @ 167 NONAME - _ZN18RadioScannerEngine16continueScanningEv @ 168 NONAME - _ZN18RadioScannerEngine16emitStationFoundERK12RadioStation @ 169 NONAME - _ZN18RadioScannerEngine16staticMetaObjectE @ 170 NONAME DATA 16 - _ZN18RadioScannerEngine19addScannedFrequencyEj @ 171 NONAME - _ZN18RadioScannerEngine19getStaticMetaObjectEv @ 172 NONAME - _ZN18RadioScannerEngine6cancelEv @ 173 NONAME - _ZN18RadioScannerEngineC1ER20RadioUiEnginePrivate @ 174 NONAME - _ZN18RadioScannerEngineC2ER20RadioUiEnginePrivate @ 175 NONAME - _ZN18RadioScannerEngineD0Ev @ 176 NONAME - _ZN18RadioScannerEngineD1Ev @ 177 NONAME - _ZN18RadioScannerEngineD2Ev @ 178 NONAME - _ZNK12RadioStation10hasChangedEv @ 179 NONAME - _ZNK12RadioStation10hasSentRdsEv @ 180 NONAME - _ZNK12RadioStation10isDetachedEv @ 181 NONAME - _ZNK12RadioStation10isFavoriteEv @ 182 NONAME - _ZNK12RadioStation11changeFlagsEv @ 183 NONAME - _ZNK12RadioStation11presetIndexEv @ 184 NONAME - _ZNK12RadioStation13dynamicPsTextEv @ 185 NONAME - _ZNK12RadioStation14hasDataChangedE6QFlagsINS_10ChangeFlagEE @ 186 NONAME - _ZNK12RadioStation15frequencyStringEv @ 187 NONAME - _ZNK12RadioStation3urlEv @ 188 NONAME - _ZNK12RadioStation4nameEv @ 189 NONAME - _ZNK12RadioStation5genreEv @ 190 NONAME - _ZNK12RadioStation6isTypeE6QFlagsINS_8TypeFlagEE @ 191 NONAME - _ZNK12RadioStation6piCodeEv @ 192 NONAME - _ZNK12RadioStation6psTypeEv @ 193 NONAME - _ZNK12RadioStation7isValidEv @ 194 NONAME - _ZNK12RadioStation9frequencyEv @ 195 NONAME - _ZNK12RadioStation9isRenamedEv @ 196 NONAME - _ZNK12RadioStation9radioTextEv @ 197 NONAME - _ZNK13RadioUiEngine10isScanningEv @ 198 NONAME - _ZNK13RadioUiEngine10metaObjectEv @ 199 NONAME - _ZNK13RadioUiEngine12maxFrequencyEv @ 200 NONAME - _ZNK13RadioUiEngine12minFrequencyEv @ 201 NONAME - _ZNK13RadioUiEngine13isInitializedEv @ 202 NONAME - _ZNK13RadioUiEngine13isPoweringOffEv @ 203 NONAME - _ZNK13RadioUiEngine16currentFrequencyEv @ 204 NONAME - _ZNK13RadioUiEngine17frequencyStepSizeEv @ 205 NONAME - _ZNK13RadioUiEngine17isAntennaAttachedEv @ 206 NONAME - _ZNK13RadioUiEngine18isInManualSeekModeEv @ 207 NONAME - _ZNK13RadioUiEngine18isUsingLoudspeakerEv @ 208 NONAME - _ZNK13RadioUiEngine6regionEv @ 209 NONAME - _ZNK13RadioUiEngine7isMutedEv @ 210 NONAME - _ZNK13RadioUiEngine9isRadioOnEv @ 211 NONAME - _ZNK16RadioHistoryItem10isDetachedEv @ 212 NONAME - _ZNK16RadioHistoryItem17isRecognizedByRdsEv @ 213 NONAME - _ZNK16RadioHistoryItem2idEv @ 214 NONAME - _ZNK16RadioHistoryItem4timeEv @ 215 NONAME - _ZNK16RadioHistoryItem5titleEv @ 216 NONAME - _ZNK16RadioHistoryItem6artistEv @ 217 NONAME - _ZNK16RadioHistoryItem7isValidEv @ 218 NONAME - _ZNK16RadioHistoryItem7stationEv @ 219 NONAME - _ZNK16RadioHistoryItem8isTaggedEv @ 220 NONAME - _ZNK16RadioHistoryItem9frequencyEv @ 221 NONAME - _ZNK17RadioHistoryModel10metaObjectEv @ 222 NONAME - _ZNK17RadioHistoryModel11itemAtIndexERK11QModelIndex @ 223 NONAME - _ZNK17RadioHistoryModel23isCurrentSongRecognizedEv @ 224 NONAME - _ZNK17RadioHistoryModel4dataERK11QModelIndexi @ 225 NONAME - _ZNK17RadioHistoryModel8rowCountERK11QModelIndex @ 226 NONAME - _ZNK17RadioStationModel10metaObjectEv @ 227 NONAME - _ZNK17RadioStationModel11findStationEjN12FindCriteria8CriteriaE @ 228 NONAME - _ZNK17RadioStationModel13findFrequencyEjR12RadioStationN12FindCriteria8CriteriaE @ 229 NONAME - _ZNK17RadioStationModel14currentStationEv @ 230 NONAME - _ZNK17RadioStationModel4dataERK11QModelIndexi @ 231 NONAME - _ZNK17RadioStationModel4listEv @ 232 NONAME - _ZNK17RadioStationModel5flagsERK11QModelIndex @ 233 NONAME - _ZNK17RadioStationModel8containsEj @ 234 NONAME - _ZNK17RadioStationModel8rowCountERK11QModelIndex @ 235 NONAME - _ZNK17RadioStationModel9stationAtEi @ 236 NONAME - _ZNK18RadioScannerEngine10isScanningEv @ 237 NONAME - _ZNK18RadioScannerEngine10metaObjectEv @ 238 NONAME - _ZTI12RadioStation @ 239 NONAME - _ZTI13RadioUiEngine @ 240 NONAME - _ZTI17RadioHistoryModel @ 241 NONAME - _ZTI17RadioStationModel @ 242 NONAME - _ZTI18RadioScannerEngine @ 243 NONAME - _ZTV12RadioStation @ 244 NONAME - _ZTV13RadioUiEngine @ 245 NONAME - _ZTV17RadioHistoryModel @ 246 NONAME - _ZTV17RadioStationModel @ 247 NONAME - _ZTV18RadioScannerEngine @ 248 NONAME + _ZN17RadioHistoryModel20removeByModelIndicesER5QListI11QModelIndexEb @ 115 NONAME + _ZN17RadioHistoryModel7addItemERK7QStringS2_RK12RadioStation @ 116 NONAME + _ZN17RadioHistoryModel8setIconsERK5QIconS2_ @ 117 NONAME + _ZN17RadioHistoryModel9itemAddedEv @ 118 NONAME + _ZN17RadioHistoryModel9removeAllEb @ 119 NONAME + _ZN17RadioHistoryModelC1ER13RadioUiEngine @ 120 NONAME + _ZN17RadioHistoryModelC2ER13RadioUiEngine @ 121 NONAME + _ZN17RadioHistoryModelD0Ev @ 122 NONAME + _ZN17RadioHistoryModelD1Ev @ 123 NONAME + _ZN17RadioHistoryModelD2Ev @ 124 NONAME + _ZN17RadioStationModel10addStationERK12RadioStation @ 125 NONAME + _ZN17RadioStationModel10initializeEP18RadioPresetStorageP18RadioEngineWrapper @ 126 NONAME + _ZN17RadioStationModel10localCountEv @ 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 + _ZN17RadioStationModel18indexFromFrequencyEj @ 148 NONAME + _ZN17RadioStationModel18stationDataChangedERK12RadioStation @ 149 NONAME + _ZN17RadioStationModel19dynamicPsCheckEndedEv @ 150 NONAME + _ZN17RadioStationModel19getStaticMetaObjectEv @ 151 NONAME + _ZN17RadioStationModel19removeByPresetIndexEi @ 152 NONAME + _ZN17RadioStationModel19setFavoriteByPresetEib @ 153 NONAME + _ZN17RadioStationModel20removeByModelIndicesER5QListI11QModelIndexEb @ 154 NONAME + _ZN17RadioStationModel21findUnusedPresetIndexEv @ 155 NONAME + _ZN17RadioStationModel22setFavoriteByFrequencyEjb @ 156 NONAME + _ZN17RadioStationModel7setDataERK11QModelIndexRK8QVarianti @ 157 NONAME + _ZN17RadioStationModel8setIconsERK5QIconS2_S2_ @ 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 + _ZNK12RadioStation10hasSentRdsEv @ 182 NONAME + _ZNK12RadioStation10isDetachedEv @ 183 NONAME + _ZNK12RadioStation10isFavoriteEv @ 184 NONAME + _ZNK12RadioStation11changeFlagsEv @ 185 NONAME + _ZNK12RadioStation11presetIndexEv @ 186 NONAME + _ZNK12RadioStation13dynamicPsTextEv @ 187 NONAME + _ZNK12RadioStation14hasDataChangedE6QFlagsINS_10ChangeFlagEE @ 188 NONAME + _ZNK12RadioStation15frequencyStringEv @ 189 NONAME + _ZNK12RadioStation3urlEv @ 190 NONAME + _ZNK12RadioStation4nameEv @ 191 NONAME + _ZNK12RadioStation5genreEv @ 192 NONAME + _ZNK12RadioStation6isTypeE6QFlagsINS_8TypeFlagEE @ 193 NONAME + _ZNK12RadioStation6piCodeEv @ 194 NONAME + _ZNK12RadioStation6psTypeEv @ 195 NONAME + _ZNK12RadioStation7isValidEv @ 196 NONAME + _ZNK12RadioStation9frequencyEv @ 197 NONAME + _ZNK12RadioStation9isRenamedEv @ 198 NONAME + _ZNK12RadioStation9radioTextEv @ 199 NONAME + _ZNK13RadioUiEngine10isScanningEv @ 200 NONAME + _ZNK13RadioUiEngine10metaObjectEv @ 201 NONAME + _ZNK13RadioUiEngine12maxFrequencyEv @ 202 NONAME + _ZNK13RadioUiEngine12minFrequencyEv @ 203 NONAME + _ZNK13RadioUiEngine13isInitializedEv @ 204 NONAME + _ZNK13RadioUiEngine13isPoweringOffEv @ 205 NONAME + _ZNK13RadioUiEngine16currentFrequencyEv @ 206 NONAME + _ZNK13RadioUiEngine17frequencyStepSizeEv @ 207 NONAME + _ZNK13RadioUiEngine17isAntennaAttachedEv @ 208 NONAME + _ZNK13RadioUiEngine18isInManualSeekModeEv @ 209 NONAME + _ZNK13RadioUiEngine18isUsingLoudspeakerEv @ 210 NONAME + _ZNK13RadioUiEngine6regionEv @ 211 NONAME + _ZNK13RadioUiEngine7isMutedEv @ 212 NONAME + _ZNK13RadioUiEngine9isRadioOnEv @ 213 NONAME + _ZNK16RadioHistoryItem10isDetachedEv @ 214 NONAME + _ZNK16RadioHistoryItem17isRecognizedByRdsEv @ 215 NONAME + _ZNK16RadioHistoryItem2idEv @ 216 NONAME + _ZNK16RadioHistoryItem4timeEv @ 217 NONAME + _ZNK16RadioHistoryItem5titleEv @ 218 NONAME + _ZNK16RadioHistoryItem6artistEv @ 219 NONAME + _ZNK16RadioHistoryItem7isValidEv @ 220 NONAME + _ZNK16RadioHistoryItem7stationEv @ 221 NONAME + _ZNK16RadioHistoryItem8isTaggedEv @ 222 NONAME + _ZNK16RadioHistoryItem9frequencyEv @ 223 NONAME + _ZNK17RadioHistoryModel10metaObjectEv @ 224 NONAME + _ZNK17RadioHistoryModel11itemAtIndexERK11QModelIndex @ 225 NONAME + _ZNK17RadioHistoryModel23isCurrentSongRecognizedEv @ 226 NONAME + _ZNK17RadioHistoryModel4dataERK11QModelIndexi @ 227 NONAME + _ZNK17RadioHistoryModel8rowCountERK11QModelIndex @ 228 NONAME + _ZNK17RadioStationModel10metaObjectEv @ 229 NONAME + _ZNK17RadioStationModel11findStationEjN12FindCriteria8CriteriaE @ 230 NONAME + _ZNK17RadioStationModel13findFrequencyEjR12RadioStationN12FindCriteria8CriteriaE @ 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 + _ZTI17RadioHistoryModel @ 243 NONAME + _ZTI17RadioStationModel @ 244 NONAME + _ZTI18RadioScannerEngine @ 245 NONAME + _ZTV12RadioStation @ 246 NONAME + _ZTV13RadioUiEngine @ 247 NONAME + _ZTV17RadioHistoryModel @ 248 NONAME + _ZTV17RadioStationModel @ 249 NONAME + _ZTV18RadioScannerEngine @ 250 NONAME diff -r bbebb0235466 -r a8ba0c289b44 radioapp/radioapplication/resources/fmradio.ts --- a/radioapp/radioapplication/resources/fmradio.ts Mon Sep 20 18:04:48 2010 +0300 +++ b/radioapp/radioapplication/resources/fmradio.ts Tue Oct 05 09:31:22 2010 +0300 @@ -9,7 +9,7 @@ qtl_dialog_pri_heading FmRadio dialog - Fm + FmRadio False @@ -19,7 +19,7 @@ txt_rad_info_news FmRadio_001 info - Fm + FmRadio False @@ -29,17 +29,7 @@ txt_rad_info_news FmRadio_001 info - Fm - False - - - Dialog text displayed when user is about to clear all recently played songs in Recently played songs view. - Clear Recently played songs list? - Clear Recently played songs list? - qtl_dialog_pri5 - FmRadio - info - Fm + FmRadio False @@ -49,17 +39,7 @@ qtl_menu_pri FmRadio_001 opt - Fm - False - - - Button. Ignores the dialog and returns previous view - Cancel - Cancel - qtl_dialog_softkey - common - button - co + FmRadio False @@ -69,7 +49,7 @@ txt_rad_info_news FmRadio_001 info - Fm + FmRadio False @@ -79,7 +59,7 @@ qtl_menu_pri FmRadio_001, FmRadio_002 opt - Fm + FmRadio False @@ -89,7 +69,17 @@ txt_rad_info_news FmRadio_001 info - Fm + FmRadio + False + + + %L1 is amount of selected items in multiselection list. %L2 is the total amount of items on the list. + %L1/%L2 + %L1/%L2 + qtl_fullscreen_dialog_counter_tiny + FmRadio_005 + dblist + FmRadio False @@ -99,7 +89,7 @@ qtl_list_sec_graphic FmRadio_002 dblist_val - Fm + FmRadio False @@ -109,17 +99,7 @@ txt_rad_info_news FmRadio_001 info - Fm - False - - - Discreet popup notification text. Displayed after region has been automatically selected. - Local frequency band automatically set for radio. - Local frequency band automatically set for radio. - qtl_notifdialog_pri2 - FmRadio - info - Fm + FmRadio False @@ -129,7 +109,7 @@ qtl_list_sec2_graphic FmRadio_003 dblist_val - Fm + FmRadio False @@ -139,7 +119,7 @@ qtl_list_sec_graphic FmRadio_002 dblist_val - Fm + FmRadio False @@ -149,7 +129,7 @@ txt_rad_info_news FmRadio_001 info - Fm + FmRadio False @@ -159,7 +139,7 @@ qtl_groupbox_simple_sec FmRadio_003 subhead - Fm + FmRadio False @@ -169,7 +149,7 @@ qtl_list_sec_graphic FmRadio_002 dblist_val - Fm + FmRadio False @@ -179,7 +159,7 @@ txt_rad_button_stations FmRadio_001 button - Fm + FmRadio False @@ -189,7 +169,7 @@ txt_rad_info_news FmRadio_001 info - Fm + FmRadio False @@ -199,17 +179,7 @@ txt_rad_info_news FmRadio_001 info - Fm - False - - - Options list item. Empties the Recently played songs or Tagged songs list. - Clear list - Clear list - qtl_menu_pri - FmRadio_003 - opt - Fm + FmRadio False @@ -219,7 +189,7 @@ qtl_list_sec_graphic FmRadio_002 dblist_val - Fm + FmRadio False @@ -229,7 +199,7 @@ txt_rad_info_news FmRadio_001 info - Fm + FmRadio False @@ -239,7 +209,7 @@ qtl_list_sec_graphic FmRadio_002 dblist_val - Fm + FmRadio False @@ -249,7 +219,7 @@ txt_rad_button_stations FmRadio_001 button - Fm + FmRadio False @@ -259,17 +229,7 @@ qtl_list_sec_graphic FmRadio_002 dblist_val - Fm - False - - - Item specific menu item. Allows the user to delete a station. - Delete - Delete - qtl_menu_sec - common - menu - co + FmRadio False @@ -279,7 +239,7 @@ txt_rad_info_news FmRadio_001 info - Fm + FmRadio False @@ -289,17 +249,20 @@ txt_rad_info_news FmRadio_001 info - Fm + FmRadio False - - Item specific menu item. Allows the user to define a new name for a station. - Rename - Rename - qtl_menu_sec - common - menu - co + + Discreet popup heading text displaying how many song information have been deleted. Displayed after song information have been deleted. + %Ln song information deleted. + + (s)%Ln song information deleted. + (p)%Ln song information deleted. + + qtl_notifdialog_pri2 + FmRadio + dpophead + FmRadio False @@ -309,7 +272,7 @@ txt_rad_info_news FmRadio_001 info - Fm + FmRadio False @@ -319,7 +282,7 @@ qtl_list_sec_graphic FmRadio_002 dblist_val - Fm + FmRadio False @@ -329,7 +292,7 @@ txt_rad_info_news FmRadio_001 info - Fm + FmRadio False @@ -339,7 +302,17 @@ qtl_list_sec_graphic FmRadio_002 dblist_val - Fm + FmRadio + False + + + Caption for selecting all items in multiselection list. Used in Play history and Stations views. + Select all + Select all + qtl_fullscreen_dialog_checkbox_sec + FmRadio_005 + setlabel_1 + FmRadio False @@ -349,7 +322,7 @@ qtl_list_sec_graphic FmRadio_002 dblist_val - Fm + FmRadio False @@ -359,7 +332,7 @@ txt_rad_info_news FmRadio_001 info - Fm + FmRadio False @@ -369,7 +342,7 @@ txt_rad_info_news FmRadio_001 info - Fm + FmRadio False @@ -379,7 +352,7 @@ qtl_list_sec_graphic FmRadio_002 dblist_val - Fm + FmRadio False @@ -389,27 +362,7 @@ txt_rad_info_news FmRadio_001 info - Fm - False - - - Button. Pressing this button rejects the selected operation. - No - No - qtl_dialog_softkey - common - button - co - False - - - Button. Allows the user to accept the dialog and return to previous view - OK - OK - qtl_dialog_softkey - common - button - co + FmRadio False @@ -419,7 +372,7 @@ qtl_dialog_pri5 FmRadio info - Fm + FmRadio False @@ -429,17 +382,17 @@ txt_rad_info_no_favourites_add_favourites_to_see FmRadio_002 info - Fm + FmRadio False - - Dialog text displayed when user is about to clear the all stations in Favourite stations view. - Clear Favourite stations list? - Clear Favourite stations list? - qtl_dialog_pri5 - FmRadio - info - Fm + + Heading for the full screen multiselection dialog for deleting stations in All stations view. + Delete stations? + Delete stations? + qtl_fullscreen_dialog_heading_pri + FmRadio_005 + title + FmRadio False @@ -449,7 +402,7 @@ txt_rad_info_news FmRadio_001 info - Fm + FmRadio False @@ -459,7 +412,7 @@ txt_rad_info_no_favourite_stations FmRadio_002 info - Fm + FmRadio False @@ -469,7 +422,7 @@ txt_rad_button_stations FmRadio_001 button - Fm + FmRadio False @@ -479,7 +432,7 @@ txt_rad_info_news FmRadio_001 info - Fm + FmRadio False @@ -489,7 +442,7 @@ txt_rad_button_stations FmRadio_001 button - Fm + FmRadio False @@ -499,7 +452,7 @@ txt_rad_info_news FmRadio_001 info - Fm + FmRadio False @@ -509,7 +462,7 @@ txt_rad_info_news FmRadio_001 info - Fm + FmRadio False @@ -519,7 +472,7 @@ txt_rad_info_news FmRadio_001 info - Fm + FmRadio False @@ -529,7 +482,7 @@ qtl_list_pri_large_graphic FmRadio list - Fm + FmRadio False @@ -539,7 +492,7 @@ txt_rad_info_news FmRadio_001 info - Fm + FmRadio False @@ -549,7 +502,7 @@ qtl_list_sec_graphic FmRadio_002 dblist_val - Fm + FmRadio False @@ -559,7 +512,7 @@ txt_rad_info_news FmRadio_001 info - Fm + FmRadio False @@ -569,7 +522,7 @@ qtl_list_sec_graphic FmRadio_002 dblist_val - Fm + FmRadio False @@ -579,7 +532,7 @@ qtl_homescreen_shortcut Home_screen_001 caption - Ho + Home False @@ -589,7 +542,7 @@ qtl_list_sec_graphic FmRadio_002 dblist_val - Fm + FmRadio False @@ -599,7 +552,7 @@ qtl_menu_sec FmRadio_002 menu - Fm + FmRadio False @@ -609,7 +562,7 @@ qtl_titlebar FmRadio title - Fm + FmRadio False @@ -619,7 +572,7 @@ txt_rad_button_cancel FmRadio_001 button - Fm + FmRadio False @@ -629,7 +582,7 @@ qtl_dialog_pri5 FmRadio info - Fm + FmRadio False @@ -639,7 +592,7 @@ qtl_list_sec_graphic FmRadio_002 dblist_val - Fm + FmRadio False @@ -649,7 +602,7 @@ qtl_menu_sec FmRadio_002 menu - Fm + FmRadio False @@ -659,7 +612,7 @@ txt_rad_info_news FmRadio_001 info - Fm + FmRadio False @@ -669,7 +622,7 @@ txt_rad_info_you_can_add_song_to_the_tagged_songs FmRadio_003 info - Fm + FmRadio False @@ -679,7 +632,7 @@ qtl_list_sec_graphic FmRadio_002 dblist_val - Fm + FmRadio False @@ -689,7 +642,7 @@ qtl_list_sec_graphic FmRadio_002 dblist_val - Fm + FmRadio False @@ -699,7 +652,7 @@ qtl_list_sec_graphic FmRadio_002 dblist_val - Fm + FmRadio False @@ -709,7 +662,7 @@ qtl_list_sec_graphic FmRadio_002 dblist_val - Fm + FmRadio False @@ -719,7 +672,7 @@ qtl_dialog_pri5 FmRadio info - Fm + FmRadio False @@ -729,7 +682,7 @@ qtl_list_pri_large_graphic FmRadio_003 dblist - Fm + FmRadio False @@ -739,7 +692,7 @@ qtl_list_sec_graphic FmRadio_002 dblist_val - Fm + FmRadio False @@ -749,17 +702,7 @@ txt_rad_info_song_information_is_collected_automat FmRadio_003 info - Fm - False - - - Dialog text displayed when user is about to clear the all stations in All stations view. - Clear All stations list? - Clear All stations list? - qtl_dialog_pri5 - FmRadio - info - Fm + FmRadio False @@ -769,7 +712,7 @@ qtl_list_sec_graphic FmRadio_002 dblist_val - Fm + FmRadio False @@ -779,7 +722,7 @@ qtl_notifdialog_pri2_medium_graphic FmRadio dpophead - Fm + FmRadio False @@ -789,17 +732,7 @@ qtl_list_sec_graphic FmRadio_002 dblist_val - Fm - False - - - Button. Pressing this button confirms the selected operation. - Yes - Yes - qtl_dialog_softkey - common - button - co + FmRadio False @@ -809,7 +742,7 @@ qtl_list_sec_graphic FmRadio_002 dblist_val - Fm + FmRadio False @@ -819,7 +752,7 @@ qtl_dialog_pri5 FmRadio info - Fm + FmRadio False @@ -829,7 +762,7 @@ qtl_dialog_pri3 FmRadio_004 info - Fm + FmRadio False @@ -839,7 +772,7 @@ qtl_list_sec_graphic FmRadio_002 dblist_val - Fm + FmRadio False @@ -849,27 +782,7 @@ txt_rad_info_news FmRadio_001 info - Fm - False - - - Options list item. Deactivates the loudspeaker. Only available if audio can be routed to the headset - Deactivate loudspeaker - Deactivate loudspeaker - qtl_menu_pri - common - opt - co - False - - - Dialog text displayed when user is about to clear all tagged songs in Tagged songs view. - Clear Tagged songs list? - Clear Tagged songs list? - qtl_dialog_pri5 - FmRadio - info - Fm + FmRadio False @@ -879,7 +792,7 @@ qtl_list_sec_graphic FmRadio_002 dblist_val - Fm + FmRadio False @@ -889,7 +802,7 @@ txt_rad_list_searching_all_available_stations_ple FmRadio_001 info - Fm + FmRadio False @@ -899,7 +812,7 @@ qtl_list_sec_graphic FmRadio_002 dblist_val - Fm + FmRadio False @@ -909,7 +822,7 @@ qtl_dialog_pri5 FmRadio info - Fm + FmRadio False @@ -919,7 +832,7 @@ qtl_menu_sec FmRadio_001, FmRadio_003 menu - Fm + FmRadio False @@ -929,7 +842,20 @@ txt_rad_info_no_stations_search_stations_automat FmRadio_002 info - Fm + FmRadio + False + + + Discreet popup heading text displaying how many favorites have been removed. Displayed after favorite(s) have been deleted. + %Ln favorite removed. + + (s)%Ln favorite removed. + (p)%Ln favorite removed. + + qtl_notifdialog_pri2 + FmRadio + dpophead + FmRadio False @@ -939,7 +865,7 @@ qtl_groupbox_simple_sec FmRadio_002 subhead - Fm + FmRadio False @@ -949,7 +875,7 @@ txt_rad_info_news FmRadio_001 info - Fm + FmRadio False @@ -959,7 +885,7 @@ qtl_list_sec_graphic FmRadio_002 dblist_val - Fm + FmRadio False @@ -969,7 +895,7 @@ qtl_list_sec_graphic FmRadio_002 dblist_val - Fm + FmRadio False @@ -979,7 +905,7 @@ qtl_dialog_pri5 FmRadio info - Fm + FmRadio False @@ -989,17 +915,7 @@ txt_rad_info_no_stations FmRadio_002 info - Fm - False - - - Options list item. With the exit option, the user can close the currently active application and return to the Home screen. - Exit - Exit - qtl_menu_pri - common - opt - co + FmRadio False @@ -1009,7 +925,7 @@ txt_rad_info_news FmRadio_001 info - Fm + FmRadio False @@ -1019,7 +935,7 @@ txt_rad_info_news FmRadio_001 info - Fm + FmRadio False @@ -1029,7 +945,17 @@ txt_rad_info_news FmRadio_001 info - Fm + FmRadio + False + + + Heading for the full screen multiselection dialog for removing favorites in Favorites view/collection. + Remove favorites? + Remove favorites? + qtl_fullscreen_dialog_heading_pri + FmRadio_005 + title + FmRadio False @@ -1039,7 +965,7 @@ txt_rad_info_news FmRadio_001 info - Fm + FmRadio False @@ -1049,7 +975,7 @@ qtl_notifdialog_pri2 FmRadio dpophead - Fm + FmRadio False @@ -1059,7 +985,7 @@ qtl_list_sec_graphic FmRadio_002 dblist_val - Fm + FmRadio False @@ -1069,7 +995,7 @@ qtl_grid_taskswitcher_tiny tsw_01 caption - ts + tsw False @@ -1079,7 +1005,7 @@ qtl_menu_sec FmRadio_003 menu - Fm + FmRadio False @@ -1089,7 +1015,7 @@ qtl_list_sec_graphic FmRadio_002 dblist_val - Fm + FmRadio False @@ -1099,7 +1025,7 @@ qtl_list_sec_graphic FmRadio_002 dblist_val - Fm + FmRadio False @@ -1109,7 +1035,7 @@ qtl_groupbox_simple_sec FmRadio_003 subhead - Fm + FmRadio False @@ -1119,7 +1045,7 @@ qtl_list_sec_graphic FmRadio_002 dblist_val - Fm + FmRadio False @@ -1129,7 +1055,17 @@ txt_rad_info_news FmRadio_001 info - Fm + FmRadio + False + + + Heading for the full screen multiselection dialog for deleting song information in Play history view. Note that only song information is deleted. Actual songs are not stored in the device. + Delete song information? + Delete song information? + qtl_fullscreen_dialog_heading_pri + FmRadio_005 + title + FmRadio False @@ -1139,7 +1075,7 @@ qtl_list_sec_graphic FmRadio_002 dblist_val - Fm + FmRadio False @@ -1149,7 +1085,7 @@ txt_rad_info_news FmRadio_001 info - Fm + FmRadio False @@ -1159,7 +1095,7 @@ txt_rad_info_news FmRadio_001 info - Fm + FmRadio False @@ -1169,7 +1105,7 @@ qtl_list_sec_graphic FmRadio_002 dblist_val - Fm + FmRadio False @@ -1179,7 +1115,7 @@ qtl_list_sec_graphic FmRadio_002 dblist_val - Fm + FmRadio False @@ -1189,7 +1125,7 @@ qtl_list_sec_graphic FmRadio_002 dblist_val - Fm + FmRadio False @@ -1199,7 +1135,7 @@ txt_rad_info_news FmRadio_001 info - Fm + FmRadio False @@ -1209,7 +1145,7 @@ qtl_list_sec_graphic FmRadio_002 dblist_val - Fm + FmRadio False @@ -1219,7 +1155,7 @@ txt_rad_info_news FmRadio_001 info - Fm + FmRadio False @@ -1229,7 +1165,7 @@ qtl_list_pri2_graphic_add FmRadio_003 dblist - Fm + FmRadio False @@ -1239,7 +1175,7 @@ qtl_list_sec_graphic FmRadio_002 dblist_val - Fm + FmRadio False @@ -1249,7 +1185,7 @@ txt_rad_info_news FmRadio_001 info - Fm + FmRadio False @@ -1259,7 +1195,7 @@ txt_rad_info_news FmRadio_001 info - Fm + FmRadio False @@ -1269,7 +1205,7 @@ qtl_list_sec_graphic FmRadio_002 dblist_val - Fm + FmRadio False @@ -1279,7 +1215,7 @@ txt_rad_info_news FmRadio_001 info - Fm + FmRadio False @@ -1289,7 +1225,7 @@ qtl_list_sec_graphic FmRadio_002 dblist_val - Fm + FmRadio False @@ -1299,7 +1235,7 @@ qtl_list_sec_graphic FmRadio_002 dblist_val - Fm + FmRadio False @@ -1309,17 +1245,7 @@ qtl_list_pri_large_graphic FmRadio_003 dblist - Fm - False - - - Item specific menu item. Starts to play the station when selected. Not displayed if station is already playing. - Play - Play - qtl_menu_sec - common - menu - co + FmRadio False @@ -1329,7 +1255,7 @@ qtl_list_sec_graphic FmRadio_002 dblist_val - Fm + FmRadio False @@ -1339,7 +1265,7 @@ txt_rad_info_play_history_is_empty FmRadio_003 info - Fm + FmRadio False @@ -1349,7 +1275,7 @@ qtl_menu_sec FmRadio_001, FmRadio_003 menu - Fm + FmRadio False @@ -1359,7 +1285,7 @@ qtl_list_sec_graphic FmRadio_002 dblist_val - Fm + FmRadio False @@ -1369,7 +1295,7 @@ txt_rad_list_seeking FmRadio_001 info - Fm + FmRadio False @@ -1379,7 +1305,7 @@ txt_rad_info_news FmRadio_001 info - Fm + FmRadio False @@ -1389,7 +1315,7 @@ qtl_list_sec_graphic FmRadio_002 dblist_val - Fm + FmRadio False @@ -1399,7 +1325,7 @@ txt_rad_info_connect_wired_headset1 FmRadio_001 info - Fm + FmRadio False @@ -1409,7 +1335,7 @@ qtl_list_sec_graphic FmRadio_002 dblist_val - Fm + FmRadio False @@ -1419,7 +1345,7 @@ txt_rad_info_news FmRadio_001 info - Fm + FmRadio False @@ -1429,7 +1355,7 @@ qtl_list_sec_graphic FmRadio_002 dblist_val - Fm + FmRadio False @@ -1439,7 +1365,7 @@ txt_rad_info_news FmRadio_001 info - Fm + FmRadio False @@ -1449,7 +1375,7 @@ txt_rad_info_connect_wired_headset1 FmRadio_001 info - Fm + FmRadio False @@ -1459,7 +1385,7 @@ qtl_list_sec_graphic FmRadio_002 dblist_val - Fm + FmRadio False @@ -1469,7 +1395,7 @@ txt_rad_button_stations FmRadio_001 button - Fm + FmRadio False @@ -1479,7 +1405,17 @@ txt_rad_info_news FmRadio_001 info - Fm + FmRadio + False + + + Discreet popup notification text. Displayed in all other views but main view when headset antenna is removed. + Connect wired headset. + Connect wired headset. + qtl_notifdialog_pri2_medium_graphic + FmRadio + dpophead + FmRadio False @@ -1489,17 +1425,7 @@ txt_rad_info_news FmRadio_001 info - Fm - False - - - Discreet popup notification text. Displayed in all other views but main view when headset antenna is removed. - Connect wired headset. - Connect wired headset. - qtl_notifdialog_pri2_medium_graphic - FmRadio - dpophead - Fm + FmRadio False @@ -1509,7 +1435,7 @@ qtl_list_sec_graphic FmRadio_002 dblist_val - Fm + FmRadio False @@ -1519,7 +1445,20 @@ qtl_groupbox_simple_sec FmRadio_002 subhead - Fm + FmRadio + False + + + Discreet popup heading text displaying how many stations have been deleted. Displayed after station(s) have been deleted via multiselection . + %Ln station deleted. + + (s)%Ln station deleted. + (p)%Ln station deleted. + + qtl_notifdialog_pri2 + FmRadio + dpophead + FmRadio False @@ -1529,7 +1468,7 @@ txt_rad_info_news FmRadio_001 info - Fm + FmRadio False @@ -1539,7 +1478,7 @@ qtl_menu_sec FmRadio_001, FmRadio_003 menu - Fm + FmRadio False @@ -1549,7 +1488,7 @@ txt_rad_info_news FmRadio_001 info - Fm + FmRadio False @@ -1559,7 +1498,7 @@ qtl_list_pri_graphic_add FmRadio_002 dblist - Fm + FmRadio False @@ -1569,7 +1508,7 @@ txt_rad_list_l1_mhz_small FmRadio_001 list - Fm + FmRadio False @@ -1579,7 +1518,7 @@ qtl_list_sec_graphic FmRadio_002 dblist_val - Fm + FmRadio False @@ -1589,7 +1528,7 @@ qtl_dialog_pri5 FmRadio info - Fm + FmRadio False @@ -1599,17 +1538,7 @@ txt_rad_info_news FmRadio_001 info - Fm - False - - - Options list item. Switches the audio from handset or handsfree to loudspeaker. Only available if audio can be routed to the loudspeaker. - Activate loudspeaker - Activate loudspeaker - qtl_menu_pri - common - opt - co + FmRadio False @@ -1619,7 +1548,7 @@ txt_rad_info_news FmRadio_001 info - Fm + FmRadio False diff -r bbebb0235466 -r a8ba0c289b44 radioapp/radioenginewrapper/inc/mradioenginehandlerobserver.h --- a/radioapp/radioenginewrapper/inc/mradioenginehandlerobserver.h Mon Sep 20 18:04:48 2010 +0300 +++ b/radioapp/radioenginewrapper/inc/mradioenginehandlerobserver.h Tue Oct 05 09:31:22 2010 +0300 @@ -25,7 +25,6 @@ // Class declaration NONSHARABLE_CLASS( MRadioEngineHandlerObserver ) : public MRadioEngineObserver - , public MRadioAudioRoutingObserver , public MRadioSystemEventObserver { public: diff -r bbebb0235466 -r a8ba0c289b44 radioapp/radioenginewrapper/inc/radioenginehandler.h --- a/radioapp/radioenginewrapper/inc/radioenginehandler.h Mon Sep 20 18:04:48 2010 +0300 +++ b/radioapp/radioenginewrapper/inc/radioenginehandler.h Tue Oct 05 09:31:22 2010 +0300 @@ -23,7 +23,6 @@ // User includes #include "radio_global.h" -#include "mradioengineinitializer.h" // Forward declarations class CRadioEngine; @@ -32,7 +31,7 @@ class MRadioApplicationSettings; // Class declaration -class RadioEngineHandler : public MRadioEngineInitializer +class RadioEngineHandler { public: @@ -188,14 +187,6 @@ */ MRadioApplicationSettings& applicationSettings() const; -private: - -// from base class MRadioEngineInitializer - - CRadioAudioRouter* InitAudioRouterL(); - CRadioSystemEventCollector* InitSystemEventCollectorL(); - CRadioSettings* InitSettingsL(); - private: // data /*! diff -r bbebb0235466 -r a8ba0c289b44 radioapp/radioenginewrapper/inc/radioenginewrapper_p.h --- a/radioapp/radioenginewrapper/inc/radioenginewrapper_p.h Mon Sep 20 18:04:48 2010 +0300 +++ b/radioapp/radioenginewrapper/inc/radioenginewrapper_p.h Tue Oct 05 09:31:22 2010 +0300 @@ -100,10 +100,6 @@ void RegionEventL( TInt aRegion, TInt aError ); void FmTransmitterEventL( TBool /*aActive*/ ) {} -// from base class MRadioAudioRoutingObserver - - void AudioRouteChangedL( RadioEngine::TRadioAudioRoute aRoute ); - // from base class MRadioSystemEventObserver void HandleSystemEventL( TRadioSystemEventType aEventType ); diff -r bbebb0235466 -r a8ba0c289b44 radioapp/radioenginewrapper/inc/settings.xml --- a/radioapp/radioenginewrapper/inc/settings.xml Mon Sep 20 18:04:48 2010 +0300 +++ b/radioapp/radioenginewrapper/inc/settings.xml Tue Oct 05 09:31:22 2010 +0300 @@ -12,6 +12,7 @@ Yle Suomi + 0x5fA8 Yle Oulu diff -r bbebb0235466 -r a8ba0c289b44 radioapp/radioenginewrapper/src/radioenginehandler.cpp --- a/radioapp/radioenginewrapper/src/radioenginehandler.cpp Mon Sep 20 18:04:48 2010 +0300 +++ b/radioapp/radioenginewrapper/src/radioenginehandler.cpp Tue Oct 05 09:31:22 2010 +0300 @@ -98,7 +98,7 @@ LOG_METHOD; CRadioEngine* engine = NULL; - TRAPD( err, engine = CRadioEngine::NewL( *this ) ); + TRAPD( err, engine = CRadioEngine::NewL() ); if ( err ) { return false; } @@ -340,26 +340,3 @@ 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(); -} diff -r bbebb0235466 -r a8ba0c289b44 radioapp/radioenginewrapper/src/radioenginewrapper_p.cpp --- a/radioapp/radioenginewrapper/src/radioenginewrapper_p.cpp Mon Sep 20 18:04:48 2010 +0300 +++ b/radioapp/radioenginewrapper/src/radioenginewrapper_p.cpp Tue Oct 05 09:31:22 2010 +0300 @@ -193,8 +193,11 @@ */ void RadioEngineWrapperPrivate::AudioRoutingEventL( TInt aAudioDestination, TInt aError ) { - Q_UNUSED( aAudioDestination ) - Q_UNUSED( aError ) + if( !aError ) + { + mUseLoudspeaker = aAudioDestination == RadioEngine::ERadioSpeaker; + RUN_NOTIFY_LOOP( mObservers, audioRouteChanged( mUseLoudspeaker ) ); + } } /*! @@ -216,15 +219,6 @@ /*! * \reimp */ -void RadioEngineWrapperPrivate::AudioRouteChangedL( RadioEngine::TRadioAudioRoute aRoute ) -{ - mUseLoudspeaker = aRoute == RadioEngine::ERadioSpeaker; - RUN_NOTIFY_LOOP( mObservers, audioRouteChanged( mUseLoudspeaker ) ); -} - -/*! - * \reimp - */ void RadioEngineWrapperPrivate::HandleSystemEventL( TRadioSystemEventType DEBUGVAR( aEventType ) ) { LOG_FORMAT( "RadioEngineWrapperPrivate::HandleSystemEventL, Event: %d", aEventType ); diff -r bbebb0235466 -r a8ba0c289b44 radioapp/radioenginewrapper/src/radioenginewrapper_win32.cpp --- a/radioapp/radioenginewrapper/src/radioenginewrapper_win32.cpp Mon Sep 20 18:04:48 2010 +0300 +++ b/radioapp/radioenginewrapper/src/radioenginewrapper_win32.cpp Tue Oct 05 09:31:22 2010 +0300 @@ -166,8 +166,9 @@ { Q_D( RadioEngineWrapper ); d->mManualSeekMode = manualSeek; + if ( !manualSeek ) { - RUN_NOTIFY_LOOP( d->mObservers, tunedToFrequency( d->mFrequency, d->mTuneReason ) ); + RUN_NOTIFY_LOOP( d->observers(), tunedToFrequency( currentFrequency(), TuneReason::ManualSeekTune ) ); } } diff -r bbebb0235466 -r a8ba0c289b44 radioapp/radioenginewrapper/src/radioenginewrapper_win32_p.cpp --- a/radioapp/radioenginewrapper/src/radioenginewrapper_win32_p.cpp Mon Sep 20 18:04:48 2010 +0300 +++ b/radioapp/radioenginewrapper/src/radioenginewrapper_win32_p.cpp Tue Oct 05 09:31:22 2010 +0300 @@ -35,8 +35,8 @@ const QString KKeyOffline = "Offline"; const uint KScanFrequencies[] = { - 87600000, - 88000000, + 87500000, + 88100000, 89400000, 96000000, 97600000, diff -r bbebb0235466 -r a8ba0c289b44 radioapp/radiopresetstorage/tsrc/t_radiopresetstorage.pro --- a/radioapp/radiopresetstorage/tsrc/t_radiopresetstorage.pro Mon Sep 20 18:04:48 2010 +0300 +++ b/radioapp/radiopresetstorage/tsrc/t_radiopresetstorage.pro Tue Oct 05 09:31:22 2010 +0300 @@ -31,6 +31,10 @@ MMP_RULES += SMPSAFE } +CONFIG += qtestlib \ + Hb \ + symbian_test + DEPENDPATH += . \ inc \ src @@ -45,7 +49,7 @@ ../../radiouiengine/inc \ ../../../../inc -CONFIG += qtestlib + symbian:LIBS += -lfmradioenginewrapper symbian:LIBS += -lfmradiopresetstorage diff -r bbebb0235466 -r a8ba0c289b44 radioapp/radiouiengine/inc/radiohistorymodel.h --- a/radioapp/radiouiengine/inc/radiohistorymodel.h Mon Sep 20 18:04:48 2010 +0300 +++ b/radioapp/radiouiengine/inc/radiohistorymodel.h Tue Oct 05 09:31:22 2010 +0300 @@ -75,6 +75,7 @@ RadioHistoryItem itemAtIndex( const QModelIndex& index ) const; void removeAll( bool removeTagged ); + void removeByModelIndices( QModelIndexList& indices, bool removeTags ); signals: diff -r bbebb0235466 -r a8ba0c289b44 radioapp/radiouiengine/inc/radiohistorymodel_p.h --- a/radioapp/radiouiengine/inc/radiohistorymodel_p.h Mon Sep 20 18:04:48 2010 +0300 +++ b/radioapp/radiouiengine/inc/radiohistorymodel_p.h Tue Oct 05 09:31:22 2010 +0300 @@ -53,6 +53,8 @@ QVariant data( const int row, const int role ) const; void removeAll( bool removeTagged ); + + void removeByModelIndices( QModelIndexList& indices, bool removeTags ); enum ViewMode{ ShowAll, ShowTagged }; void setViewMode( ViewMode mode ); @@ -67,6 +69,7 @@ QSqlQuery beginTransaction(); enum Operation{ NoOp, InsertRows, RemoveRows, ChangeData }; void commitTransaction( QSqlQuery& query, Operation operation, int start, int end = -1 ); + bool prepareAndExec( QSqlQuery& query, const QString& sqlStr ); public: // data diff -r bbebb0235466 -r a8ba0c289b44 radioapp/radiouiengine/inc/radiostationmodel.h --- a/radioapp/radiouiengine/inc/radiostationmodel.h Mon Sep 20 18:04:48 2010 +0300 +++ b/radioapp/radiouiengine/inc/radiostationmodel.h Tue Oct 05 09:31:22 2010 +0300 @@ -138,6 +138,7 @@ void removeByFrequency( uint frequency ); void removeByPresetIndex( int presetIndex ); void removeStation( const RadioStation& station ); + void removeByModelIndices( QModelIndexList& indices, bool removeFavorites = false ); /** * Removes all stations diff -r bbebb0235466 -r a8ba0c289b44 radioapp/radiouiengine/src/radiohistorymodel.cpp --- a/radioapp/radiouiengine/src/radiohistorymodel.cpp Mon Sep 20 18:04:48 2010 +0300 +++ b/radioapp/radiouiengine/src/radiohistorymodel.cpp Tue Oct 05 09:31:22 2010 +0300 @@ -149,6 +149,14 @@ Q_D( RadioHistoryModel ); d->removeAll( removeTagged ); } +/*! + * + */ +void RadioHistoryModel::removeByModelIndices( QModelIndexList& indices, bool removeTags ) +{ + Q_D( RadioHistoryModel ); + d->removeByModelIndices( indices, removeTags ); +} /*! * diff -r bbebb0235466 -r a8ba0c289b44 radioapp/radiouiengine/src/radiohistorymodel_p.cpp --- a/radioapp/radiouiengine/src/radiohistorymodel_p.cpp Mon Sep 20 18:04:48 2010 +0300 +++ b/radioapp/radiouiengine/src/radiohistorymodel_p.cpp Tue Oct 05 09:31:22 2010 +0300 @@ -60,6 +60,12 @@ //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 = ?" ); +static const QLatin1String SQL_DELETE_ITEM_FORMAT_STR ( "DELETE FROM history WHERE id = %1" ); +static const QLatin1String SQL_REMOVE_TAG_FORMAT_STR ( "UPDATE history SET tagged = 0 WHERE id = %1" ); +static const QLatin1String OR_ID_IS_FORMAT_STR (" OR id = %1"); + +static const int MAX_ID_COUNT_IN_QUERY = 5; + #ifdef LOGGING_ENABLED # define GET_ERR( param ) GETSTRING( param.lastError().text() ) # define GET_ERR_PTR( param ) GETSTRING( param->lastError().text() ) @@ -262,6 +268,66 @@ /*! * */ +void RadioHistoryModelPrivate::removeByModelIndices( QModelIndexList& indices, bool removeTags ) +{ + if ( !mQueryModel ) { + return; + } + QString sqlStr = ""; + int rowIndex = -1; + + QSqlQuery query( *mDatabase ); + mDatabase->transaction(); + // List needs to be sorted and indices needs to go throught from largest to smallest. + // This is for keeping QmodelIndexing in sync after begin- and endremoverows + // calls when content is not yet actually removed. + // Real removal happens in QSqlQuery::exec + qSort(indices); + QModelIndexList::const_iterator iter = indices.constEnd(); + QModelIndexList::const_iterator begin = indices.constBegin(); + for ( int counter = 1; iter != begin; ) { + iter--; + rowIndex = (*iter).row(); + if( rowIndex > -1 ) { + QSqlRecord record = mQueryModel->record(rowIndex); + + if( counter > 1 ) { + sqlStr += QString( OR_ID_IS_FORMAT_STR ).arg(record.value("id").toInt()); + } else { + sqlStr = QString( removeTags ? SQL_REMOVE_TAG_FORMAT_STR + : SQL_DELETE_ITEM_FORMAT_STR ).arg(record.value("id").toInt()); + } + // adding max MAX_ID_COUNT_IN_QUERY ids to Query + if( counter == MAX_ID_COUNT_IN_QUERY ) { + if( !prepareAndExec( query, sqlStr ) ) { + // error, do not proceed + break; + } + counter = 1; + sqlStr = ""; + } else { + counter++; + } + q_ptr->beginRemoveRows( QModelIndex(), rowIndex, rowIndex ); + q_ptr->endRemoveRows(); + } + } + if( !query.lastError().isValid() && sqlStr.length() ) { + prepareAndExec( query, sqlStr ); + } + if( query.lastError().isValid() ) { + // in case of error, rollback everyhing and reset model + mDatabase->rollback(); + q_ptr->reset(); + } else { + mDatabase->commit(); + refreshModel(); + } +} + +/*! + * + */ void RadioHistoryModelPrivate::setViewMode( ViewMode mode ) { if ( !mQueryModel ) { @@ -282,7 +348,6 @@ updateQuery.prepare( SQL_TOGGLE_TAG ); updateQuery.addBindValue( item.isTagged() ? 0 : 1 ); updateQuery.addBindValue( item.id() ); - Operation operation = ChangeData; if ( mViewMode == ShowTagged && item.isTagged() ) { operation = RemoveRows; @@ -359,3 +424,14 @@ LOG_ASSERT( success, LOG_FORMAT( "Rollback failed! err: %s", GET_ERR_PTR( mDatabase ) ) ); } } + +bool RadioHistoryModelPrivate::prepareAndExec( QSqlQuery& query, const QString& sqlStr ) +{ + bool isOk = true; + isOk = query.prepare(sqlStr); + + if(isOk) { + isOk = query.exec(); + } + return isOk; +} diff -r bbebb0235466 -r a8ba0c289b44 radioapp/radiouiengine/src/radiostationmodel.cpp --- a/radioapp/radiouiengine/src/radiostationmodel.cpp Mon Sep 20 18:04:48 2010 +0300 +++ b/radioapp/radiouiengine/src/radiostationmodel.cpp Tue Oct 05 09:31:22 2010 +0300 @@ -449,6 +449,28 @@ endRemoveRows(); } } +/*! + * Removes stations based on model indices + */ +void RadioStationModel::removeByModelIndices( QModelIndexList& indices, bool removefavorite ) +{ + // List needs to be sorted and indices needs to go throught from largest to smallest. + // This is for keeping QmodelIndexing in sync after begin- and endremoverows, which + // are needed for each item separately + qSort( indices ); + QModelIndexList::const_iterator iter = indices.constEnd(); + QModelIndexList::const_iterator begin = indices.constBegin(); + RadioStation station; + while( iter != begin ) { + iter--; + station = stationAt( (*iter).row() ); + if( removefavorite ) { + setFavoriteByPreset( station.presetIndex(), false ); + } else { + removeStation( station ); + } + } +} /*! * Public slot diff -r bbebb0235466 -r a8ba0c289b44 radioapp/radiowidgets/inc/radiofrequencyitem.h --- a/radioapp/radiowidgets/inc/radiofrequencyitem.h Mon Sep 20 18:04:48 2010 +0300 +++ b/radioapp/radiowidgets/inc/radiofrequencyitem.h Tue Oct 05 09:31:22 2010 +0300 @@ -29,7 +29,7 @@ { public: - RadioFrequencyItem( QString frequency ); + RadioFrequencyItem( uint frequency ); uint frequency() const; diff -r bbebb0235466 -r a8ba0c289b44 radioapp/radiowidgets/inc/radiofrequencystripbase.h --- a/radioapp/radiowidgets/inc/radiofrequencystripbase.h Mon Sep 20 18:04:48 2010 +0300 +++ b/radioapp/radiowidgets/inc/radiofrequencystripbase.h Tue Oct 05 09:31:22 2010 +0300 @@ -139,7 +139,7 @@ void updateAllItems(); - QPixmap drawPixmap( uint frequency, QList stations, RadioFrequencyItem* item ); + QPixmap drawPixmap( uint mainFrequency, QList stations, RadioFrequencyItem* item ); QLineF makeTab( qreal pos, int height ); @@ -219,6 +219,8 @@ QColor mForegroundColor; + bool mIgnoreScrollingEnd; + }; #endif // RADIOFREQUENCYSTRIPBASE_H diff -r bbebb0235466 -r a8ba0c289b44 radioapp/radiowidgets/inc/radiofrequencystripdef.h --- a/radioapp/radiowidgets/inc/radiofrequencystripdef.h Mon Sep 20 18:04:48 2010 +0300 +++ b/radioapp/radiowidgets/inc/radiofrequencystripdef.h Tue Oct 05 09:31:22 2010 +0300 @@ -58,6 +58,7 @@ const qreal ROUNDER = 0.5; const int SELECTOR_WIDTH = 2; const int SELECTOR_Z_POS = 100; + const int SELECTOR_MARGIN = 3; const int ONE_HERTZ = 1000000; const int HALF_HERTZ = ONE_HERTZ / 2; @@ -80,9 +81,9 @@ const int DECIMAL_FONT_SIZE = 4; #endif // BUILD_WIN32 - const QFont FREQUENCY_FONT( "", FREQUENCY_FONT_SIZE ); - const QFont DECIMAL_FONT( "", DECIMAL_FONT_SIZE ); - const int FREQUENCY_TEXT_Y_POS = 35; + const QFont FREQUENCY_FONT( "", FREQUENCY_FONT_SIZE, QFont::Bold ); + const QFont DECIMAL_FONT( "", DECIMAL_FONT_SIZE, QFont::Bold ); + const int FREQUENCY_TEXT_Y_POS = 25; const int STATION_MARKER_Y_POS = 10; static const QLatin1String SLIDE_TO_LEFT ( "SlideToLeft" ); diff -r bbebb0235466 -r a8ba0c289b44 radioapp/radiowidgets/inc/radiohistoryview.h --- a/radioapp/radiowidgets/inc/radiohistoryview.h Mon Sep 20 18:04:48 2010 +0300 +++ b/radioapp/radiowidgets/inc/radiohistoryview.h Tue Oct 05 09:31:22 2010 +0300 @@ -54,7 +54,7 @@ private slots: void updateViewMode(); - void clearList(); + void openMultiSelection(); void updateVisibilities(); void showContextMenu( const QModelIndex& index ); void handleLongPress( HbAbstractViewItem* item ); diff -r bbebb0235466 -r a8ba0c289b44 radioapp/radiowidgets/inc/radiostationcarousel.h --- a/radioapp/radiowidgets/inc/radiostationcarousel.h Mon Sep 20 18:04:48 2010 +0300 +++ b/radioapp/radiowidgets/inc/radiostationcarousel.h Tue Oct 05 09:31:22 2010 +0300 @@ -209,6 +209,7 @@ int mCurrentIndex; int mTargetIndex; + int mCurrentFrequency; bool mIsCustomFreq; CarouselInfoText::Type mInfoTextType; diff -r bbebb0235466 -r a8ba0c289b44 radioapp/radiowidgets/inc/radiostationsview.h --- a/radioapp/radiowidgets/inc/radiostationsview.h Mon Sep 20 18:04:48 2010 +0300 +++ b/radioapp/radiowidgets/inc/radiostationsview.h Tue Oct 05 09:31:22 2010 +0300 @@ -68,7 +68,7 @@ void startScanning(); void finishScanning(); void updateVisibilities(); - void clearList(); + void openMultiSelection(); void play(); // Called from context menu void rename(); // Called from context menu void toggleFavorite(); // Called from context menu @@ -93,7 +93,7 @@ QSortFilterProxyModel* mFilterModel; HbAction* mScanStationsAction; - HbAction* mClearListAction; + HbAction* mMultiSelectionAction; HbListView* mStationsList; @@ -108,7 +108,7 @@ QScopedPointer mFrequencyScanner; - enum UserQuestion { NoQuestion, DeleteStation, StartScanning, ClearList }; + enum UserQuestion { NoQuestion, DeleteStation, StartScanning, MultiSelection }; UserQuestion mCurrentQuestion; }; diff -r bbebb0235466 -r a8ba0c289b44 radioapp/radiowidgets/inc/radiouiloader.h --- a/radioapp/radiowidgets/inc/radiouiloader.h Mon Sep 20 18:04:48 2010 +0300 +++ b/radioapp/radiowidgets/inc/radiouiloader.h Tue Oct 05 09:31:22 2010 +0300 @@ -63,7 +63,7 @@ static const QLatin1String SV_NAME_FAVORITES_BUTTON ( "sv:favorite_stations_button" ); static const QLatin1String SV_NAME_LOCALS_BUTTON ( "sv:local_stations_button" ); 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_MULTI_SELECTION_ACTION ( "sv:multi_selection_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" ); @@ -90,7 +90,7 @@ static const QLatin1String MV_NAME_INFO_TEXT ( "mv:info_text" ); // History View - static const QLatin1String HV_NAME_CLEAR_LIST_ACTION ( "hv:clear_list_action" ); + static const QLatin1String HV_NAME_MULTI_DELETE_ACTION ( "hv:multi_delete_action" ); static const QLatin1String HV_NAME_HISTORY_LIST ( "hv:history_list" ); static const QLatin1String HV_NAME_ALL_SONGS_BUTTON ( "hv:all_songs_button" ); static const QLatin1String HV_NAME_TAGGED_SONGS_BUTTON ( "hv:tagged_songs_button" ); diff -r bbebb0235466 -r a8ba0c289b44 radioapp/radiowidgets/inc/radioutil.h --- a/radioapp/radiowidgets/inc/radioutil.h Mon Sep 20 18:04:48 2010 +0300 +++ b/radioapp/radiowidgets/inc/radioutil.h Tue Oct 05 09:31:22 2010 +0300 @@ -30,6 +30,7 @@ class RadioStationCarousel; class RadioFrequencyScanner; class HbNotificationDialog; +class QSortFilterProxyModel; struct EffectInfo { @@ -70,6 +71,10 @@ static TuneReason::Reason tuneReason( int tuneReason ); static void showDiscreetNote( const QString& text ); + + static void mapToSource( const QModelIndexList& proxyIndices, + QModelIndexList& sourceIndices, + const QSortFilterProxyModel* model); private: diff -r bbebb0235466 -r a8ba0c289b44 radioapp/radiowidgets/inc/radioviewbase.h --- a/radioapp/radiowidgets/inc/radioviewbase.h Mon Sep 20 18:04:48 2010 +0300 +++ b/radioapp/radiowidgets/inc/radioviewbase.h Tue Oct 05 09:31:22 2010 +0300 @@ -31,6 +31,7 @@ class RadioUiLoader; class HbAction; class RadioUiEngine; +class HbSelectionDialog; // Constants namespace MenuItem @@ -92,6 +93,10 @@ void loadSection( const QString& docml, const QString& section ); void askQuestion( const QString& question ); + + void showSelectionDialog( QAbstractItemModel* model, + const QString& titleTxt, + const QString& confirmBtnTxt ); private: diff -r bbebb0235466 -r a8ba0c289b44 radioapp/radiowidgets/res/layout/historyview.docml --- a/radioapp/radiowidgets/res/layout/historyview.docml Mon Sep 20 18:04:48 2010 +0300 +++ b/radioapp/radiowidgets/res/layout/historyview.docml Tue Oct 05 09:31:22 2010 +0300 @@ -1,7 +1,7 @@ - - + + @@ -64,7 +64,7 @@
- + @@ -113,7 +113,7 @@ - + @@ -124,7 +124,7 @@ - + diff -r bbebb0235466 -r a8ba0c289b44 radioapp/radiowidgets/res/layout/radiocarouselitem.css --- a/radioapp/radiowidgets/res/layout/radiocarouselitem.css Mon Sep 20 18:04:48 2010 +0300 +++ b/radioapp/radiowidgets/res/layout/radiocarouselitem.css Tue Oct 05 09:31:22 2010 +0300 @@ -38,7 +38,7 @@ RadioCarouselItem::genre_label::text { - color: lightgray; /*var(qtc_lcd_title_normal);*/ + color: var(qtc_lcd_title_normal); font-variant: secondary; text-align: center center; } @@ -75,7 +75,7 @@ RadioCarouselItem::name_label::text { - color: white; /*var(qtc_lcd_title_normal);*/ + color: var(qtc_lcd_title_normal); font-variant: primary; text-wrap-mode: no-wrap; text-align: center top; @@ -115,18 +115,20 @@ RadioCarouselItem[appearance=Full]::rt_label::text { text-line-count-max: 4; - text-wrap-mode: word-wrap; /*wrap-anywhere; */ + text-wrap-mode: word-wrap; text-align: center center; } RadioCarouselItem[appearance=Full][landscape]::rt_label::text { text-height: expr(var(hb-param-text-height-secondary)*0.95); + max-width: expr(var(hb-param-screen-width)/2 - var(hb-param-margin-gene-left) - var(hb-param-margin-gene-right) - var(hb-param-margin-gene-middle-horizontal) - var(hb-param-margin-gene-middle-horizontal)/2); } RadioCarouselItem[appearance=Full][!landscape]::rt_label::text { text-height: var(hb-param-text-height-secondary); + max-width: expr(var(hb-param-screen-width) - var(hb-param-margin-gene-left) - var(hb-param-margin-gene-right) - 2*var(hb-param-margin-gene-middle-horizontal)); } RadioCarouselItem[appearance!=Full]::rt_label::text diff -r bbebb0235466 -r a8ba0c289b44 radioapp/radiowidgets/res/layout/stationsview.docml --- a/radioapp/radiowidgets/res/layout/stationsview.docml Mon Sep 20 18:04:48 2010 +0300 +++ b/radioapp/radiowidgets/res/layout/stationsview.docml Tue Oct 05 09:31:22 2010 +0300 @@ -2,10 +2,10 @@ - - - - + + + + @@ -38,7 +38,7 @@ - + @@ -140,6 +140,9 @@ + + + @@ -160,6 +163,9 @@ + + + diff -r bbebb0235466 -r a8ba0c289b44 radioapp/radiowidgets/src/radiocarouselitem.cpp --- a/radioapp/radiowidgets/src/radiocarouselitem.cpp Mon Sep 20 18:04:48 2010 +0300 +++ b/radioapp/radiowidgets/src/radiocarouselitem.cpp Tue Oct 05 09:31:22 2010 +0300 @@ -39,9 +39,9 @@ const QLatin1String RT_LABEL ( "rt_label" ); const QLatin1String URL_LABEL ( "url_label" ); -const QLatin1String SEEKING_TEXT ( "txt_rad_list_tuning" ); -const QLatin1String CONNECT_HEADSET_TEXT( "txt_rad_list_connect_wireless_antenna_headset_with" ); -const uint CAROUSEL_LENGTH = 11; +const QLatin1String SEEKING_TEXT ( "txt_rad_list_tuning" ); +const QLatin1String CONNECT_HEADSET_TEXT ( "txt_rad_list_connect_wireless_antenna_headset_with" ); +const int PS_NAME_MAX_VISIBILE_LENGTH = 11; /*! * @@ -112,7 +112,11 @@ mRadiotextItem = new HbRichTextItem( this ); HbStyle::setItemName( mRadiotextItem, RT_LABEL ); - + + // TODO: Proper text wrapping mode can be set in style sheet once + // TextWrapAtWordBoundaryOrAnywhere counterpart gets available + mRadiotextItem->setTextWrapping( Hb::TextWrapAtWordBoundaryOrAnywhere ); + mUrlItem = new HbTextItem( this ); HbStyle::setItemName( mUrlItem, URL_LABEL ); @@ -309,7 +313,7 @@ const bool hasName = mStation->hasName(); if ( hasName ) { - if ( mStation->name().length() > CAROUSEL_LENGTH ) { + if ( mStation->name().length() > PS_NAME_MAX_VISIBILE_LENGTH ) { mNameItem->setAlignment( Qt::AlignLeft ); } else { mNameItem->setAlignment( Qt::AlignHCenter ); @@ -327,7 +331,7 @@ if ( mStation->hasDynamicPs() ) { mRadiotextItem->setText( mStation->dynamicPsText() ); } else if ( hasName ) { - const QString loc = "%L1 Mhz"; //hbTrId( "txt_rad_list_l1_mhz_small" ); + const QString loc = hbTrId( "txt_rad_list_l1_mhz_small" ); mRadiotextItem->setText( loc.arg( mStation->frequencyString() ) ); } else { mRadiotextItem->setText( "" ); diff -r bbebb0235466 -r a8ba0c289b44 radioapp/radiowidgets/src/radiofrequencyitem.cpp --- a/radioapp/radiowidgets/src/radiofrequencyitem.cpp Mon Sep 20 18:04:48 2010 +0300 +++ b/radioapp/radiowidgets/src/radiofrequencyitem.cpp Tue Oct 05 09:31:22 2010 +0300 @@ -25,8 +25,8 @@ /*! * */ -RadioFrequencyItem::RadioFrequencyItem( QString frequency ) : - mFrequency( frequency.isEmpty() ? 0 : frequency.toInt() * FrequencyStrip::ONE_HERTZ ), +RadioFrequencyItem::RadioFrequencyItem( uint frequency ) : + mFrequency( frequency == 0 ? 0 : frequency * FrequencyStrip::ONE_HERTZ ), mGraphicsItem( 0 ) { } diff -r bbebb0235466 -r a8ba0c289b44 radioapp/radiowidgets/src/radiofrequencystripbase.cpp --- a/radioapp/radiowidgets/src/radiofrequencystripbase.cpp Mon Sep 20 18:04:48 2010 +0300 +++ b/radioapp/radiowidgets/src/radiofrequencystripbase.cpp Tue Oct 05 09:31:22 2010 +0300 @@ -86,11 +86,9 @@ mManualSeekMode( false ), mLastReportedFrequency( 0 ), mManualSeekTimerId( 0 ), - mForegroundColor( Qt::white )//HbColorScheme::color( FrequencyStrip::TEXT_COLOR_ATTRIBUTE ) ) + mForegroundColor( Qt::white ),//HbColorScheme::color( FrequencyStrip::TEXT_COLOR_ATTRIBUTE ) ) + mIgnoreScrollingEnd( false ) { - setScrollingStyle( HbScrollArea::PanWithFollowOn ); - setItemSize( QSizeF( FrequencyStrip::ITEM_WIDTH + FrequencyStrip::PIXMAP_OVERLAP / 2, mItemHeight ) ); - setOverlap( FrequencyStrip::PIXMAP_OVERLAP / 2 ); } /*! @@ -119,13 +117,18 @@ mFrequencyStepSize = stepSize; mFrequency = frequency; + setScrollingStyle( HbScrollArea::PanWithFollowOn ); + + HbDeviceProfile deviceProfile; + mItemHeight = static_cast( mItemHeight * deviceProfile.unitValue() ); + setItemSize( QSizeF( FrequencyStrip::ITEM_WIDTH + FrequencyStrip::PIXMAP_OVERLAP / 2, mItemHeight ) ); + + setOverlap( FrequencyStrip::PIXMAP_OVERLAP / 2 ); + initModel(); initEmptyItems(); initPositions(); - HbDeviceProfile deviceProfile; - mItemHeight = static_cast( mItemHeight * deviceProfile.unitValue() ); - mManualSeekTimer = new QTimer( this ); mManualSeekTimer->setInterval( FrequencyStrip::MANUALSEEK_START_TIMEOUT ); mManualSeekTimer->setSingleShot( true ); @@ -342,6 +345,11 @@ */ void RadioFrequencyStripBase::handleScrollingEnd() { + if ( mIgnoreScrollingEnd ) { + mIgnoreScrollingEnd = false; + return; + } + // Check if the selector is in the invalid area where the strip loops around const int selectorPosition = selectorPos(); if ( mManualSeekMode ) { @@ -386,8 +394,8 @@ if ( mManualSeekMode ) { const int pos = selectorPos(); const uint frequency = mPositions.value( pos ); - if ( frequency > 0 ) { - mFrequency = mPositions.value( pos ); + if ( frequency > 0 && mFrequency != frequency ) { + mFrequency = frequency; emitFrequencyChanged( mFrequency, FrequencyStrip::ManualSeekUpdate, Scroll::Shortest ); } } @@ -467,6 +475,7 @@ */ void RadioFrequencyStripBase::gestureEvent( QGestureEvent* event ) { + mIgnoreScrollingEnd = true; HbSwipeGesture* swipeGesture = static_cast( event->gesture( Qt::SwipeGesture ) ); if ( swipeGesture && !mManualSeekMode ) { if ( swipeGesture->state() == Qt::GestureFinished ) { @@ -502,13 +511,11 @@ const uint maxFreq = uint( qreal(mMaxFrequency) / FrequencyStrip::ONE_HERTZ + 0.9 ); // always round up QStringList list; - QString freqText; for ( uint i = minFreq; i <= maxFreq; ++i ) { - freqText = QString::number( i ); - list.append( freqText ); - mFrequencyItems.append( new RadioFrequencyItem( freqText ) ); + list.append( QString::number( i ) ); + mFrequencyItems.append( new RadioFrequencyItem( i ) ); } - mFrequencyItems.append( new RadioFrequencyItem( "" ) ); + mFrequencyItems.append( new RadioFrequencyItem( 0 ) ); list.append( "" ); mMaxWidth = list.count() * FrequencyStrip::ITEM_WIDTH; @@ -527,10 +534,11 @@ */ void RadioFrequencyStripBase::initSelector() { - QPixmap selectorPixmap = QPixmap( QSize( FrequencyStrip::SELECTOR_WIDTH, (int)size().height() ) ); + QPixmap selectorPixmap = QPixmap( QSize( FrequencyStrip::SELECTOR_WIDTH, (int)size().height() - FrequencyStrip::SELECTOR_MARGIN * 2 ) ); selectorPixmap.fill( Qt::red ); mSelectorImage->setPixmap( selectorPixmap ); mSelectorImage->setZValue( FrequencyStrip::SELECTOR_Z_POS ); + mSelectorImage->setPos( 0, FrequencyStrip::SELECTOR_MARGIN ); } /*! @@ -670,40 +678,36 @@ /*! * */ -QPixmap RadioFrequencyStripBase::drawPixmap( uint frequency, QList stations, RadioFrequencyItem* item ) +QPixmap RadioFrequencyStripBase::drawPixmap( uint mainFrequency, QList stations, RadioFrequencyItem* item ) { QPixmap pixmap( FrequencyStrip::PIXMAP_WIDTH, mItemHeight ); pixmap.fill( Qt::transparent ); + + if ( mainFrequency == 0 ) { + return pixmap; + } + QPainter painter( &pixmap ); QPen normalPen = painter.pen(); QPen favoritePen = normalPen; normalPen.setColor( mForegroundColor ); painter.setPen( normalPen ); - if ( frequency == 0 ) { - painter.drawLine( makeTab( mSeparatorPos - 1 + FrequencyStrip::ROUNDER, mItemHeight ) ); - painter.drawLine( makeTab( mSeparatorPos + FrequencyStrip::ROUNDER, mItemHeight ) ); - return pixmap; - } - - const QString itemText = QString::number( frequency / FrequencyStrip::ONE_HERTZ ); - const uint startFrequency = frequency - FrequencyStrip::HALF_HERTZ; - const uint endFrequency = startFrequency + FrequencyStrip::ONE_HERTZ; + const uint frequencyIncrement = qMin( mFrequencyStepSize, FrequencyStrip::ONE_HUNDRED_KHZ ); + const QString itemText = QString::number( mainFrequency / FrequencyStrip::ONE_HERTZ ); + const uint startFrequency = mainFrequency - FrequencyStrip::HALF_HERTZ + frequencyIncrement; + const uint endFrequency = mainFrequency + FrequencyStrip::HALF_HERTZ; const uint roundedMin = int( qreal(mMinFrequency) / FrequencyStrip::ONE_HERTZ + FrequencyStrip::ROUNDER ); - const uint freq = frequency / FrequencyStrip::ONE_HERTZ; + const uint freq = mainFrequency / FrequencyStrip::ONE_HERTZ; const int diff = freq - roundedMin; const qreal startPixel = diff * FrequencyStrip::ITEM_WIDTH; qreal pixels = 0.0; const qreal leftOverlap = FrequencyStrip::PIXMAP_OVERLAP / 2; - for ( uint frequency = startFrequency; frequency <= endFrequency; frequency += mFrequencyStepSize ) { + for ( uint loopFrequency = startFrequency; loopFrequency <= endFrequency; loopFrequency += frequencyIncrement ) { - if ( frequency < mMinFrequency || frequency > mMaxFrequency ) { - continue; - } - - pixels = qreal( frequency - startFrequency ) / FrequencyStrip::PIXEL_IN_HZ; - if ( frequency % FrequencyStrip::ONE_HERTZ == 0 ) { + pixels = qreal( loopFrequency - startFrequency ) / FrequencyStrip::PIXEL_IN_HZ; + if ( loopFrequency % FrequencyStrip::ONE_HERTZ == 0 ) { // Draw the high frequency tab and the frequency text for the even number normalPen.setWidth( 3 ); @@ -712,7 +716,7 @@ normalPen.setWidth( 1 ); painter.setPen( normalPen ); - // Draw the frequency text and its 00 decimals + // Draw the frequency text and its decimals painter.setFont( FrequencyStrip::DECIMAL_FONT ); const int decimalWidth = painter.fontMetrics().width( FrequencyStrip::DECIMAL_TEXT ); const int decimalSpace = painter.fontMetrics().leftBearing( '.' ); @@ -723,19 +727,22 @@ painter.setFont( FrequencyStrip::DECIMAL_FONT ); painter.drawText( QPoint( textPosX + frequencyWidth + decimalSpace, FrequencyStrip::FREQUENCY_TEXT_Y_POS ), FrequencyStrip::DECIMAL_TEXT ); - } else if ( frequency % FrequencyStrip::ONE_TAB_IN_HZ == 0 ) { + } else if ( loopFrequency % FrequencyStrip::ONE_TAB_IN_HZ == 0 ) { // Draw the low frequency tab for the uneven number painter.drawLine( makeTab( pixels + leftOverlap, FrequencyStrip::TAB_HEIGHT_SMALL ) ); } - addFrequencyPos( int( startPixel + pixels + FrequencyStrip::ROUNDER ), frequency, item ); + if ( ( loopFrequency - mMinFrequency ) % mFrequencyStepSize == 0 && loopFrequency >= mMinFrequency && loopFrequency <= mMaxFrequency ) { + addFrequencyPos( int( startPixel + pixels + FrequencyStrip::ROUNDER ), loopFrequency, item ); + } } // Draw favorites and local stations favoritePen.setColor( Qt::yellow ); + const int markerYPos = mItemHeight - 18; foreach ( const FrequencyStrip::StationMarker& station, stations ) { const uint frequency = station.mFrequency; pixels = qreal( frequency - startFrequency ) / FrequencyStrip::PIXEL_IN_HZ; @@ -743,11 +750,13 @@ if ( station.mIsFavorite ) { favoritePen.setWidth( FrequencyStrip::PEN_WIDTH_FAVORITE ); painter.setPen( favoritePen ); - painter.drawEllipse( int( pixels + leftOverlap - 3 ), FrequencyStrip::STATION_MARKER_Y_POS - 3, 6, 6 ); + painter.drawEllipse( int( pixels + leftOverlap - 3 ), markerYPos - 3, 6, 6 ); +// painter.drawEllipse( int( pixels + leftOverlap - 3 ), FrequencyStrip::STATION_MARKER_Y_POS - 3, 6, 6 ); } else { favoritePen.setWidth( 1 ); painter.setPen( favoritePen ); - painter.drawEllipse( int( pixels + leftOverlap - 4 ), FrequencyStrip::STATION_MARKER_Y_POS - 4, 8, 8 ); + painter.drawEllipse( int( pixels + leftOverlap - 4 ), markerYPos - 4, 8, 8 ); +// painter.drawEllipse( int( pixels + leftOverlap - 4 ), FrequencyStrip::STATION_MARKER_Y_POS - 4, 8, 8 ); } } diff -r bbebb0235466 -r a8ba0c289b44 radioapp/radiowidgets/src/radiohistoryview.cpp --- a/radioapp/radiowidgets/src/radiohistoryview.cpp Mon Sep 20 18:04:48 2010 +0300 +++ b/radioapp/radiowidgets/src/radiohistoryview.cpp Tue Oct 05 09:31:22 2010 +0300 @@ -21,6 +21,7 @@ #include #include #include +#include // User includes #include "radiohistoryview.h" @@ -30,6 +31,7 @@ #include "radiouiengine.h" #include "radiohistorymodel.h" #include "radiohistoryitem.h" +#include "radioutil.h" // BEGIN TEMPORARY TEST CODE CODE #include @@ -130,11 +132,11 @@ * Private slot * */ -void RadioHistoryView::clearList() +void RadioHistoryView::openMultiSelection() { - const bool showingTagged = mTaggedSongsButton->isChecked(); - askQuestion( hbTrId( showingTagged ? "txt_rad_info_clear_tagged_songs_list" : - "txt_rad_info_clear_recently_played_songs_list" ) ); + showSelectionDialog( &mUiEngine->historyModel() , + hbTrId( "txt_fmradio_title_delete_song_information" ), + hbTrId( "txt_common_button_delete_toolbar" ) ); } /*! @@ -270,9 +272,9 @@ mAllSongsButton = mUiLoader->findObject( DOCML::HV_NAME_ALL_SONGS_BUTTON ); mTaggedSongsButton = mUiLoader->findObject( DOCML::HV_NAME_TAGGED_SONGS_BUTTON ); - if ( HbAction* clearListAction = mUiLoader->findObject( DOCML::HV_NAME_CLEAR_LIST_ACTION ) ) { - Radio::connect( clearListAction, SIGNAL(triggered()), - this, SLOT(clearList()) ); + if ( HbAction* multiDelAction = mUiLoader->findObject( DOCML::HV_NAME_MULTI_DELETE_ACTION ) ) { + Radio::connect( multiDelAction, SIGNAL(triggered()), + this, SLOT(openMultiSelection()) ); } Radio::connect( mTaggedSongsButton, SIGNAL(triggered()), @@ -321,9 +323,20 @@ */ void RadioHistoryView::userAccepted() { - const bool removeTagged = mTaggedSongsButton->isChecked(); - mUiEngine->historyModel().removeAll( removeTagged ); - updateVisibilities(); + HbSelectionDialog* dlg = static_cast( sender() ); + if(dlg) { + bool favoriteMode = mTaggedSongsButton->isChecked(); + QModelIndexList selected = dlg->selectedModelIndexes(); + int count = selected.count(); + if( count == mUiEngine->historyModel().rowCount() ) { + mUiEngine->historyModel().removeAll( favoriteMode ); + } else { + mUiEngine->historyModel().removeByModelIndices( selected, favoriteMode ); + } + QString msg = hbTrId("txt_rad_dpophead_l1_song_information_removed", count ); + RadioUtil::showDiscreetNote( msg ); + updateVisibilities(); + } } /*! diff -r bbebb0235466 -r a8ba0c289b44 radioapp/radiowidgets/src/radiomainview.cpp --- a/radioapp/radiowidgets/src/radiomainview.cpp Mon Sep 20 18:04:48 2010 +0300 +++ b/radioapp/radiowidgets/src/radiomainview.cpp Tue Oct 05 09:31:22 2010 +0300 @@ -269,7 +269,8 @@ updateFavoriteButton(); if ( reason != TuneReason::FrequencyStrip && reason != TuneReason::StationCarousel && - reason != TuneReason::Skip ) { + reason != TuneReason::Skip && + reason != TuneReason::ManualSeekTune ) { mCarousel->setFrequency( frequency, reason, Scroll::Shortest ); mFrequencyStrip->setFrequency( frequency, reason, Scroll::Shortest ); } diff -r bbebb0235466 -r a8ba0c289b44 radioapp/radiowidgets/src/radiostationcarousel.cpp --- a/radioapp/radiowidgets/src/radiostationcarousel.cpp Mon Sep 20 18:04:48 2010 +0300 +++ b/radioapp/radiowidgets/src/radiostationcarousel.cpp Tue Oct 05 09:31:22 2010 +0300 @@ -74,6 +74,7 @@ mMaxScrollPos( 0 ), mCurrentIndex( 0 ), mTargetIndex( -1 ), + mCurrentFrequency( 0 ), mIsCustomFreq( false ), mInfoTextType( CarouselInfoText::None ), mModel( NULL ), @@ -267,6 +268,7 @@ } } else { mItems[CenterItem]->setFrequency( frequency ); + mCurrentFrequency = frequency; } } } @@ -402,7 +404,7 @@ mItems[CenterItem]->setSeekLayout( manualSeekActive ); if ( !manualSeekActive ) { clearInfoText(); - setFrequency( mUiEngine->currentFrequency(), TuneReason::Unspecified ); + setFrequency( mCurrentFrequency, TuneReason::Unspecified ); } } diff -r bbebb0235466 -r a8ba0c289b44 radioapp/radiowidgets/src/radiostationsview.cpp --- a/radioapp/radiowidgets/src/radiostationsview.cpp Mon Sep 20 18:04:48 2010 +0300 +++ b/radioapp/radiowidgets/src/radiostationsview.cpp Tue Oct 05 09:31:22 2010 +0300 @@ -23,6 +23,7 @@ #include #include #include +#include #include // User includes @@ -34,6 +35,7 @@ #include "radiouiloader.h" #include "radiostationmodel.h" #include "radiostation.h" +#include "radioutil.h" // Constants const char* REGEX_SHOW_FAVORITES = "true"; @@ -46,7 +48,7 @@ RadioViewBase( false ), mModel( 0 ), mScanStationsAction( 0 ), - mClearListAction( 0 ), + mMultiSelectionAction( 0 ), mStationsList( 0 ), mFavoritesButton( 0 ), mLocalStationsButton( 0 ), @@ -222,9 +224,8 @@ if ( !localStationsMode ) { listEmpty = mModel->favoriteCount() == 0; } - - mClearListAction->setEnabled( !listEmpty ); - + mMultiSelectionAction->setEnabled( !listEmpty ); + const bool scanAvailable = mUiEngine->isAntennaAttached() && localStationsMode; mScanStationsAction->setEnabled( scanAvailable ); HbPushButton* scanButton = mUiLoader->findWidget( DOCML::SV_NAME_SCAN_BUTTON ); @@ -237,12 +238,15 @@ * Private slot * */ -void RadioStationsView::clearList() +void RadioStationsView::openMultiSelection() { const bool favoriteMode = mFavoritesButton->isChecked(); - mCurrentQuestion = ClearList; - askQuestion( hbTrId( favoriteMode ? "txt_rad_info_clear_favourite_stations_list" - : "txt_rad_info_clear_all_stations_list" ) ); + mCurrentQuestion = MultiSelection; + showSelectionDialog( mFilterModel , + hbTrId( favoriteMode ? "txt_fmradio_title_remove_favorites" + : "txt_fmradio_title_delete_stations" ), + hbTrId( favoriteMode ? "txt_common_button_remove" + : "txt_common_button_delete_toolbar" ) ); } /*! @@ -298,6 +302,10 @@ { HbInputDialog* dlg = static_cast( sender() ); + if ( dlg->actions().first() != action ) { + return; + } + if( action ) { mModel->renameStation( mSelectedStation->presetIndex(), dlg->value().toString() ); } @@ -364,10 +372,10 @@ Radio::connect( mScanStationsAction, SIGNAL(triggered() ), this, SLOT(startScanning() ) ); - // "Remove all presets" menu item - mClearListAction = mUiLoader->findObject( DOCML::SV_NAME_CLEAR_LIST_ACTION ); - Radio::connect( mClearListAction, SIGNAL(triggered() ), - this, SLOT(clearList() ) ); + // menu item for opening selection dialog + mMultiSelectionAction = mUiLoader->findObject( DOCML::SV_NAME_MULTI_SELECTION_ACTION ); + Radio::connect( mMultiSelectionAction, SIGNAL(triggered() ), + this, SLOT(openMultiSelection() ) ); connectCommonMenuItem( MenuItem::UseLoudspeaker ); @@ -390,14 +398,31 @@ this, SLOT(finishScanning()) ); mFrequencyScanner->startScanning(); - } else if ( mCurrentQuestion == ClearList ){ - const bool favoriteMode = mFavoritesButton->isChecked(); - mModel->removeAll( favoriteMode ? RadioStationModel::RemoveFavorites : RadioStationModel::RemoveAll ); - updateVisibilities(); } else if ( mCurrentQuestion == DeleteStation ) { mModel->removeStation( *mSelectedStation ); + } else if ( mCurrentQuestion == MultiSelection ) { + HbSelectionDialog* dlg = static_cast( sender() ); + if( dlg ) { + QModelIndexList selected = dlg->selectedModelIndexes(); + const bool favoriteMode = mFavoritesButton->isChecked(); + int count = selected.count(); + if( count == mFilterModel->rowCount() ) { + // delete or remove all + mModel->removeAll( favoriteMode ? RadioStationModel::RemoveFavorites : RadioStationModel::RemoveAll ); + } else { + // delete or remove selected, one by one. + RadioStation station; + QModelIndexList sourceIndices; + RadioUtil::mapToSource(selected, sourceIndices, mFilterModel ); + mModel->removeByModelIndices( sourceIndices, favoriteMode ); + } + QString msg = hbTrId(favoriteMode ? "txt_rad_dpophead_l1_favorite_removed" : + "txt_rad_dpophead_l1_station_deleted", count ); + RadioUtil::showDiscreetNote( msg ); + + } } - + updateVisibilities(); mCurrentQuestion = NoQuestion; } diff -r bbebb0235466 -r a8ba0c289b44 radioapp/radiowidgets/src/radiostripbase.cpp --- a/radioapp/radiowidgets/src/radiostripbase.cpp Mon Sep 20 18:04:48 2010 +0300 +++ b/radioapp/radiowidgets/src/radiostripbase.cpp Tue Oct 05 09:31:22 2010 +0300 @@ -45,7 +45,6 @@ setFlag( QGraphicsItem::ItemClipsChildrenToShape, true ); setContentWidget( mStripContainer ); setFrictionEnabled( true ); - setLongPressEnabled( false ); setHorizontalScrollBarPolicy( HbScrollArea::ScrollBarAlwaysOff ); setVerticalScrollBarPolicy( HbScrollArea::ScrollBarAlwaysOff ); diff -r bbebb0235466 -r a8ba0c289b44 radioapp/radiowidgets/src/radioutil.cpp --- a/radioapp/radiowidgets/src/radioutil.cpp Mon Sep 20 18:04:48 2010 +0300 +++ b/radioapp/radiowidgets/src/radioutil.cpp Tue Oct 05 09:31:22 2010 +0300 @@ -18,6 +18,7 @@ // System includes #include #include +#include // User includes #include "radioutil.h" @@ -181,6 +182,24 @@ /*! * */ +void RadioUtil::mapToSource( const QModelIndexList& proxyIndices, + QModelIndexList& sourceIndices, + const QSortFilterProxyModel* model) +{ + if(!model) { + return; + } + QModelIndexList::const_iterator iter = proxyIndices.constBegin(); + QModelIndexList::const_iterator end = proxyIndices.constEnd(); + while( iter != end ) { + sourceIndices.append( model->mapToSource( *iter ) ); + ++iter; + } +} + +/*! + * + */ RadioUtil& RadioUtil::instance() { if ( !::theInstance ) { diff -r bbebb0235466 -r a8ba0c289b44 radioapp/radiowidgets/src/radioviewbase.cpp --- a/radioapp/radiowidgets/src/radioviewbase.cpp Mon Sep 20 18:04:48 2010 +0300 +++ b/radioapp/radiowidgets/src/radioviewbase.cpp Tue Oct 05 09:31:22 2010 +0300 @@ -19,6 +19,7 @@ #include #include #include +#include #include #include "radioviewbase.h" @@ -147,7 +148,7 @@ */ void RadioViewBase::handleUserAnswer( HbAction* answer ) { - HbMessageBox* dlg = static_cast( sender() ); + HbDialog* dlg = static_cast( sender() ); if( dlg->actions().first() == answer ) { userAccepted(); } @@ -233,6 +234,26 @@ /*! * */ +void RadioViewBase::showSelectionDialog( QAbstractItemModel* model, + const QString& titleTxt, + const QString& confirmBtnTxt ) +{ + HbSelectionDialog* selectionDlg = new HbSelectionDialog; + selectionDlg->setModel( model ); + selectionDlg->setAttribute( Qt::WA_DeleteOnClose ); + selectionDlg->setSelectionMode( HbAbstractItemView::MultiSelection ); + selectionDlg->setHeadingText( titleTxt ); + + if( selectionDlg->actions().count() ) { + selectionDlg->actions().first()->setText( confirmBtnTxt ); + } + + selectionDlg->open( this, SLOT(handleUserAnswer( HbAction* ) ) ); +} + +/*! + * + */ void RadioViewBase::setOrientation() { // Default implementation does nothing diff -r bbebb0235466 -r a8ba0c289b44 radioengine/engine/api/cradioengine.h --- a/radioengine/engine/api/cradioengine.h Mon Sep 20 18:04:48 2010 +0300 +++ b/radioengine/engine/api/cradioengine.h Tue Oct 05 09:31:22 2010 +0300 @@ -24,7 +24,6 @@ #include "radioengine.hrh" // Forward declarations -class MRadioEngineInitializer; class CRadioAudioRouter; class CRadioSettings; class MRadioApplicationSettings; @@ -47,7 +46,7 @@ * Starts the radio engine initialization. * Asks the given initializer to create the member variables */ - IMPORT_C static CRadioEngine* NewL( MRadioEngineInitializer& aInitializer ); + IMPORT_C static CRadioEngine* NewL(); IMPORT_C ~CRadioEngine(); diff -r bbebb0235466 -r a8ba0c289b44 radioengine/engine/api/mradioengineinitializer.h --- a/radioengine/engine/api/mradioengineinitializer.h Mon Sep 20 18:04:48 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,41 +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 MRADIOENGINEINITIALIZER_H_ -#define MRADIOENGINEINITIALIZER_H_ - -// System includes -#include - -// Forward declarations -class CRadioAudioRouter; -class CRadioSystemEventCollector; -class CRadioSettings; -class CRadioEngine; - -NONSHARABLE_CLASS( MRadioEngineInitializer ) - { -public: - - virtual CRadioAudioRouter* InitAudioRouterL() = 0; - virtual CRadioSystemEventCollector* InitSystemEventCollectorL() = 0; - virtual CRadioSettings* InitSettingsL() = 0; - - }; - -#endif // MRADIOENGINEINITIALIZER_H_ diff -r bbebb0235466 -r a8ba0c289b44 radioengine/engine/bwins/fmradioengineu.def --- a/radioengine/engine/bwins/fmradioengineu.def Mon Sep 20 18:04:48 2010 +0300 +++ b/radioengine/engine/bwins/fmradioengineu.def Tue Oct 05 09:31:22 2010 +0300 @@ -1,4 +1,4 @@ EXPORTS - ??1CRadioEngine@@UAE@XZ @ 1 NONAME ; CRadioEngine::~CRadioEngine(void) - ?NewL@CRadioEngine@@SAPAV1@AAVMRadioEngineInitializer@@@Z @ 2 NONAME ; class CRadioEngine * CRadioEngine::NewL(class MRadioEngineInitializer &) + ?NewL@CRadioEngine@@SAPAV1@XZ @ 1 NONAME ; class CRadioEngine * CRadioEngine::NewL(void) + ??1CRadioEngine@@UAE@XZ @ 2 NONAME ; CRadioEngine::~CRadioEngine(void) diff -r bbebb0235466 -r a8ba0c289b44 radioengine/engine/eabi/fmradioengineu.def --- a/radioengine/engine/eabi/fmradioengineu.def Mon Sep 20 18:04:48 2010 +0300 +++ b/radioengine/engine/eabi/fmradioengineu.def Tue Oct 05 09:31:22 2010 +0300 @@ -1,5 +1,5 @@ EXPORTS - _ZN12CRadioEngine4NewLER23MRadioEngineInitializer @ 1 NONAME + _ZN12CRadioEngine4NewLEv @ 1 NONAME _ZN12CRadioEngineD0Ev @ 2 NONAME _ZN12CRadioEngineD1Ev @ 3 NONAME _ZN12CRadioEngineD2Ev @ 4 NONAME diff -r bbebb0235466 -r a8ba0c289b44 radioengine/engine/inc/cradioengineimp.h --- a/radioengine/engine/inc/cradioengineimp.h Mon Sep 20 18:04:48 2010 +0300 +++ b/radioengine/engine/inc/cradioengineimp.h Tue Oct 05 09:31:22 2010 +0300 @@ -50,11 +50,10 @@ public: + static CRadioEngineImp* NewL(); + ~CRadioEngineImp(); - void SetSystemEventCollector( CRadioSystemEventCollector* aCollector ); - void SetRadioSettings( CRadioSettings* aSettings ); - private: CRadioEngineImp( CRadioAudioRouter* aAudioRouter ); @@ -119,6 +118,7 @@ }; void ConstructL(); + /** * Switches power on/off after a delay diff -r bbebb0235466 -r a8ba0c289b44 radioengine/engine/src/cradioengine.cpp --- a/radioengine/engine/src/cradioengine.cpp Mon Sep 20 18:04:48 2010 +0300 +++ b/radioengine/engine/src/cradioengine.cpp Tue Oct 05 09:31:22 2010 +0300 @@ -19,7 +19,6 @@ #include "cradioengine.h" #include "cradioengineimp.h" #include "cradioenginelogger.h" -#include "mradioengineinitializer.h" #include "radioengineutils.h" // ================= MEMBER FUNCTIONS ======================= @@ -28,26 +27,12 @@ // Starts the radio engine initialization. // --------------------------------------------------------------------------- // -EXPORT_C CRadioEngine* CRadioEngine::NewL( MRadioEngineInitializer& aInitializer ) +EXPORT_C CRadioEngine* CRadioEngine::NewL() { RadioEngineUtils::InitializeL(); LEVEL3( LOG_METHOD_AUTO ); - CRadioAudioRouter* audioRouter = aInitializer.InitAudioRouterL(); - CleanupStack::PushL( audioRouter ); - CRadioEngineImp* self = new (ELeave) CRadioEngineImp( audioRouter ); - CleanupStack::Pop( audioRouter ); - CleanupStack::PushL( self ); - - self->SetSystemEventCollector( aInitializer.InitSystemEventCollectorL() ); - self->SetRadioSettings( aInitializer.InitSettingsL() ); - self->ConstructL(); - - self->InitRadioL( self->DetermineRegion() ); - self->EnableAudio( ETrue ); - - CleanupStack::Pop( self ); - return self; + return CRadioEngineImp::NewL(); } // --------------------------------------------------------------------------- diff -r bbebb0235466 -r a8ba0c289b44 radioengine/engine/src/cradioengineimp.cpp --- a/radioengine/engine/src/cradioengineimp.cpp Mon Sep 20 18:04:48 2010 +0300 +++ b/radioengine/engine/src/cradioengineimp.cpp Tue Oct 05 09:31:22 2010 +0300 @@ -88,6 +88,38 @@ LEVEL3( LOG_METHOD_AUTO ); } + +// --------------------------------------------------------------------------- +// +// --------------------------------------------------------------------------- +// +CRadioEngineImp* CRadioEngineImp::NewL() + { + LEVEL3( LOG_METHOD_AUTO ); + + // audiorouter is required for constructing engine so we need to create it and + // radio system event collector as observer of audiorouter before creating the + // actual engine. + CRadioSystemEventCollector *eventCollector = CRadioSystemEventCollector::NewL(); + CleanupStack::PushL( eventCollector ); + + MRadioAudioRoutingObserver* observer = 0; + eventCollector->AsObserver( observer ); + User::LeaveIfNull( observer ); + + CRadioAudioRouter* audioRouter = CRadioAudioRouter::NewL( *( observer ) ); + CleanupStack::PushL( audioRouter ); + + CRadioEngineImp* self = new (ELeave) CRadioEngineImp( audioRouter ); + + CleanupStack::Pop( audioRouter ); + CleanupStack::Pop( eventCollector ); + + self->iSystemEventCollector = eventCollector; + self->ConstructL(); + return self; + } + // --------------------------------------------------------------------------- // // --------------------------------------------------------------------------- @@ -96,13 +128,16 @@ { LOG_METHOD_AUTO; - if ( !iAudioRouter || !iSystemEventCollector || !iSettings ) + if ( !iAudioRouter || !iSystemEventCollector ) { User::Leave( KErrNotReady ); } iSystemEventCollector->AddObserverL( this ); + iSettings = CRadioSettings::NewL(); + iSettings->RadioSetter().SetObserver( this ); + // Initial default values to be over by init User::LeaveIfError( iSettings->RadioSetter().SetPowerOn( EFalse ) ); @@ -120,6 +155,9 @@ // Create timer that is used when polling for radio restart. iRadioTimer = CPeriodic::NewL( CActive::EPriorityHigh ); + + InitRadioL( DetermineRegion() ); + EnableAudio( ETrue ); } // --------------------------------------------------------------------------- @@ -176,27 +214,6 @@ // // --------------------------------------------------------------------------- // -void CRadioEngineImp::SetSystemEventCollector( CRadioSystemEventCollector* aCollector ) - { - LEVEL3( LOG_METHOD_AUTO ); - iSystemEventCollector = aCollector; - } - -// --------------------------------------------------------------------------- -// -// --------------------------------------------------------------------------- -// -void CRadioEngineImp::SetRadioSettings( CRadioSettings* aSettings ) - { - LEVEL3( LOG_METHOD_AUTO ); - iSettings = aSettings; - iSettings->RadioSetter().SetObserver( this ); - } - -// --------------------------------------------------------------------------- -// -// --------------------------------------------------------------------------- -// CRadioAudioRouter& CRadioEngineImp::AudioRouter() const { LEVEL3( LOG_METHOD_AUTO ); diff -r bbebb0235466 -r a8ba0c289b44 radioengine/utils/api/cradiosystemeventcollector.h --- a/radioengine/utils/api/cradiosystemeventcollector.h Mon Sep 20 18:04:48 2010 +0300 +++ b/radioengine/utils/api/cradiosystemeventcollector.h Tue Oct 05 09:31:22 2010 +0300 @@ -21,6 +21,7 @@ #include class MRadioSystemEventObserver; +class MRadioAudioRoutingObserver; NONSHARABLE_CLASS( CRadioSystemEventCollector ) { @@ -78,6 +79,15 @@ * @return */ virtual TBool IsHeadsetConnectedL() const = 0; + + + /** + * Returns object as provided observer + * + * @param + */ + virtual void AsObserver( MRadioAudioRoutingObserver*& obj ) const = 0; + }; diff -r bbebb0235466 -r a8ba0c289b44 radioengine/utils/inc/cradioenginetls.h --- a/radioengine/utils/inc/cradioenginetls.h Mon Sep 20 18:04:48 2010 +0300 +++ b/radioengine/utils/inc/cradioenginetls.h Tue Oct 05 09:31:22 2010 +0300 @@ -24,6 +24,7 @@ class MRadioEngineLogger; class CCoeEnv; class RFs; +class CRadioEngineLogger; /** * TLS handler diff -r bbebb0235466 -r a8ba0c289b44 radioengine/utils/inc/cradiosystemeventcollectorimp.h --- a/radioengine/utils/inc/cradiosystemeventcollectorimp.h Mon Sep 20 18:04:48 2010 +0300 +++ b/radioengine/utils/inc/cradiosystemeventcollectorimp.h Tue Oct 05 09:31:22 2010 +0300 @@ -57,7 +57,8 @@ TBool IsCallActive() const; TBool IsAudioResourcesAvailable() const; TBool IsHeadsetConnectedL() const; - + void AsObserver( MRadioAudioRoutingObserver*& obj )const; + void NotifyObserversL( TRadioSystemEventType aEvent ); // from base class MRadioSystemEventDetectorObserver diff -r bbebb0235466 -r a8ba0c289b44 radioengine/utils/src/cradiosystemeventcollectorimp.cpp --- a/radioengine/utils/src/cradiosystemeventcollectorimp.cpp Mon Sep 20 18:04:48 2010 +0300 +++ b/radioengine/utils/src/cradiosystemeventcollectorimp.cpp Tue Oct 05 09:31:22 2010 +0300 @@ -154,6 +154,15 @@ } // --------------------------------------------------------------------------- +// returns this as MRadioAudioRoutingObserver +// --------------------------------------------------------------------------- +void CRadioSystemEventCollectorImp::AsObserver( MRadioAudioRoutingObserver*& obj )const +{ + CRadioSystemEventCollectorImp *object = const_cast( this ); + obj = object; +} + +// --------------------------------------------------------------------------- // Notifies the observers of system event // --------------------------------------------------------------------------- // diff -r bbebb0235466 -r a8ba0c289b44 radiohswidget/src/radiohswidget.cpp --- a/radiohswidget/src/radiohswidget.cpp Mon Sep 20 18:04:48 2010 +0300 +++ b/radiohswidget/src/radiohswidget.cpp Tue Oct 05 09:31:22 2010 +0300 @@ -905,15 +905,9 @@ 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); } }