FCL/sf/app/radio: comparison radioapp/radiouiengine/src/radiostationmodel.cpp

equal deleted inserted replaced

-:63aabac4416d
+:f54ebcfc1b80
 #include "radiostationmodel.h"
 #include "radiostationmodel_p.h"
 #include "radiopresetstorage.h"
 #include "radioenginewrapper.h"
 #include "radiouiengine.h"
+#include "radiouiengine_p.h"
 #include "radiostation.h"
 #include "radiostation_p.h"
 #ifndef BUILD_WIN32
 #   include "radiomonitorservice.h"
 #else
 *
 */
 static QString parseLine( const RadioStation& station )
 {
 QString line = "";
-line.append( RadioUiEngine::parseFrequency( station.frequency() ) );
+const QString parsedFrequency = qtTrId( "txt_rad_dblist_l1_mhz" ).arg( RadioStation::parseFrequency( station.frequency() ) );
+line.append( parsedFrequency );
 QString name = station.name();
 if ( !name.isEmpty() )
 {
 line.append( " - " );
 }
 /*!
 *
 */
-RadioStationModel::RadioStationModel( RadioUiEngine& uiEngine ) :
+RadioStationModel::RadioStationModel( RadioUiEnginePrivate& uiEngine ) :
-QAbstractListModel( &uiEngine ),
+QAbstractListModel( &uiEngine.api() ),
 d_ptr( new RadioStationModelPrivate( this, uiEngine ) )
 {
 }
 /*!
 *
 */
 RadioStationModel::~RadioStationModel()
 {
+delete d_ptr;
 }
 /*!
 *
 */
 if ( d->mDetailLevel.testFlag( RadioStationModel::ShowGenre ) ) {
 QStringList list;
 list.append( firstLine );
 QString genre = " "; // Empty space so that the listbox generates the second row
 if ( station.genre() != -1 ) {
-genre = d->mUiEngine.genreToString( station.genre() );
+genre = d->mUiEngine.api().genreToString( station.genre(), GenreTarget::StationsList );
 }
 list.append( genre );
 return list;
 }
 return false;
 }
 /*!
-* Called by the wrapper to initialize the list with given amount of presets
+* Called by the engine to initialize the list with given amount of presets
 */
-void RadioStationModel::initialize( RadioPresetStorage* storage, RadioEngineWrapper* engine )
+void RadioStationModel::initialize( RadioPresetStorage* storage, RadioEngineWrapper* wrapper )
 {
 Q_D( RadioStationModel );
 d->mPresetStorage = storage;
-d->mEngine = engine;
+d->mWrapper = wrapper;
 const int presetCount = d->mPresetStorage->presetCount();
 int index = d->mPresetStorage->firstPreset();
 LOG_FORMAT( "RadioStationModelPrivate::initialize: presetCount: %d, firstIndex: %d", presetCount, index );
 #ifdef COMPILE_WITH_NEW_PRESET_UTILITY
 if ( station.frequency() != 87500000 )
 {
 d->mStations.insert( station.frequency(), station );
 }
 }
-++index;
 #ifdef COMPILE_WITH_NEW_PRESET_UTILITY
 index = d->mPresetStorage->nextPreset( index );
 #endif
 }
-d->setCurrentStation( d->mEngine->currentFrequency() );
+d->setCurrentStation( d->mWrapper->currentFrequency() );
+wrapper->addObserver( d );
 }
 /*!
 * Sets the icons to be used in the lists
 */
 }
 return false;
 }
 /*!
+* Finds number of favorite stations
+*/
+int RadioStationModel::favoriteCount()
+{
+Q_D( const RadioStationModel );
+int count = 0;
+foreach( const RadioStation& tempStation, d->mStations ) {
+if ( tempStation.isFavorite() ) {
+++count;
+}
+}
+return count;
+}
+/*!
 * Finds a station by preset index
 */
 int RadioStationModel::findPresetIndex( int presetIndex )
 {
 Q_D( RadioStationModel );
 d->mPresetStorage->deletePreset( tempStation.presetIndex() );
 d->mStations.remove( frequency );
 endRemoveRows();
-d->setCurrentStation( d->mEngine->currentFrequency() );
+d->mCurrentStation = NULL;
+d->setCurrentStation( d->mWrapper->currentFrequency() );
 emit stationRemoved( tempStation );
+if ( tempStation.isFavorite() ) {
+d->mUiEngine.api().monitor().notifyFavoriteCount( favoriteCount() );
+}
 }
 }
 /*!
 * Adds a new station to the list
 newStation.setPresetIndex( newIndex );
 newStation.unsetType( RadioStation::Temporary );
 // We have to call beginInsertRows() BEFORE the addition is actually done so we must figure out where
 // the new station will go in the sorted frequency order
-//    int row = 0;
+int row = 0;
-//    const int count = rowCount();
+const int count = rowCount();
-//    if ( count > 1 ) {
+if ( count > 1 ) {
-//        Stations::const_iterator iter = d->mStations.upperBound( newStation.frequency() );
+Stations::const_iterator iter = d->mStations.upperBound( newStation.frequency() );
-//        uint iterFreq = iter.key();
+uint iterFreq = iter.key();
-//        if ( d->mStations.contains( iter.key() ) ) {
+if ( d->mStations.contains( iter.key() ) ) {
-//            row = d->mStations.keys().indexOf( iter.key() );
+row = d->mStations.keys().indexOf( iter.key() );
-//        } else {
+} else {
-//            row = count;
+row = count;
-//        }
+}
-//    } else if ( count == 1 ) {
+} else if ( count == 1 ) {
-//        uint existingFreq = d->mStations.keys().first();
+uint existingFreq = d->mStations.keys().first();
-//        if ( station.frequency() > existingFreq ) {
+if ( station.frequency() > existingFreq ) {
-//            row = 1;
+row = 1;
-//        }
+}
-//    }
+}
-//
-emit layoutAboutToBeChanged();
+//    emit layoutAboutToBeChanged();
-//    beginInsertRows( QModelIndex(), row, row );
+beginInsertRows( QModelIndex(), row, row );
 // We must add the station here because saveStation() will only update an existing station
-d->mStations.insert( newStation.frequency(), newStation );
+//    d->mStations.insert( newStation.frequency(), newStation );
-saveStation( newStation );
+d->doSaveStation( newStation );
-d->setCurrentStation( d->mEngine->currentFrequency() );
+d->setCurrentStation( d->mWrapper->currentFrequency() );
-//    endInsertRows();
+endInsertRows();
-emit layoutChanged();
+//    emit layoutChanged();
 emit stationAdded( station );
 }
 /*!
 * Saves the given station. It is expected to already exist in the list
 emitChangeSignals( station, changeFlags );
 } else if ( station.isValid() && stationHasChanged && d->mStations.contains( station.frequency() )) {
-d->mStations.insert( station.frequency(), station );
+d->doSaveStation( station, changeFlags.testFlag( RadioStation::PersistentDataChanged ) );
-if ( changeFlags.testFlag( RadioStation::PersistentDataChanged ) ) {
-const bool success = d->mPresetStorage->savePreset( *station.data_ptr() );
-RADIO_ASSERT( success, "RadioStationModelPrivate::saveStation", "Failed to add station" );
-}
 emitChangeSignals( station, changeFlags );
 }
 }
 * not yet exist, it is added.
 */
 void RadioStationModel::setFavoriteByFrequency( uint frequency, bool favorite )
 {
 Q_D( RadioStationModel );
-if ( d->mEngine->isFrequencyValid( frequency ) )
+if ( d->mWrapper->isFrequencyValid( frequency ) ) {
-{
 LOG_FORMAT( "RadioStationModelPrivate::setFavoriteByFrequency, frequency: %d", frequency );
 RadioStation station;
-if ( findFrequency( frequency, station ) )  // Update existing preset
+if ( findFrequency( frequency, station ) ) { // Update existing preset
-{
+if ( station.isFavorite() != favorite ) {
-if ( station.isFavorite() != favorite )
-{
 station.setFavorite( favorite );
 saveStation( station );
 }
-}
+} else if ( favorite ) {                    // Add new preset if setting as favorite
-else if ( favorite )                    // Add new preset if setting as favorite
-{
 RadioStation newStation;
 if ( d->mCurrentStation->frequency() == frequency ) {
 newStation = *d->mCurrentStation;
 } else {
 LOG( "CurrentStation frequency mismatch!" );
 // Emit the signals only after adding the preset and reinitializing the current station
 // because the UI will probably query the current station in its slots that get called.
 addStation( newStation );
 d->setCurrentStation( frequency );
 }
+Q_D( RadioStationModel );
+d->mUiEngine.api().monitor().notifyFavoriteCount( favoriteCount() );
 }
 }
 /*!
 * Changes the favorite status of a station by its preset index
 */
 void RadioStationModel::setFavoriteByPreset( int presetIndex, bool favorite )
 {
 LOG_FORMAT( "RadioStationModelPrivate::setFavoriteByPreset, presetIndex: %d", presetIndex );
 RadioStation station;
-if ( findPresetIndex( presetIndex, station ) != RadioStation::NotFound )
+if ( findPresetIndex( presetIndex, station ) != RadioStation::NotFound ) {
-{
 station.setFavorite( favorite );
 saveStation( station );
+Q_D( RadioStationModel );
+d->mUiEngine.api().monitor().notifyFavoriteCount( favoriteCount() );
 }
 }
 /*!
 * Renames a station by its preset index
 */
 void RadioStationModel::renameStation( int presetIndex, const QString& name )
 {
 LOG_FORMAT( "RadioStationModelPrivate::renameStation, presetIndex: %d, name: %s", presetIndex, GETSTRING(name) );
 RadioStation station;
-if ( findPresetIndex( presetIndex, station ) != RadioStation::NotFound )
+if ( findPresetIndex( presetIndex, station ) != RadioStation::NotFound ) {
-{
 station.setUserDefinedName( name );
 saveStation( station );
+Q_D( RadioStationModel );
+d->mUiEngine.api().monitor().notifyName( name );
 }
 }
 /*!
 *
 foreach ( const QModelIndex& index, favorites ) {
 RadioStation station = stationAt( index.row() );
 RADIO_ASSERT( station.isValid() , "RadioStationModel::setFavorites", "invalid RadioStation");
 setFavoriteByPreset( station.presetIndex(), true );
 }
+Q_D( RadioStationModel );
+d->mUiEngine.api().monitor().notifyFavoriteCount( favoriteCount() );
 }
 /*!
 * Returns the currently tuned station
 */
 return;
 }
 QList<RadioStation> tempStations = d->mStations.values();
 beginRemoveRows( QModelIndex(), 0, rowCount() - 1 );
 // Preset utility deletes all presets with index -1
 bool success = d->mPresetStorage->deletePreset( -1 );
 RADIO_ASSERT( success, "FMRadio", "Failed to remove station" );
 d->mStations.clear();
-d->setCurrentStation( d->mEngine->currentFrequency() );
+d->mCurrentStation = NULL;
+d->setCurrentStation( d->mWrapper->currentFrequency() );
 endRemoveRows();
 foreach( RadioStation station, tempStations ) {
 emit stationRemoved( station );
 }
+reset(); // TODO: Remove. this is a workaround to HbGridView update problem
+d->mUiEngine.api().monitor().notifyFavoriteCount( favoriteCount() );
 }
 /*!
 * Private slot
 * Timer timeout slot to indicate that the dynamic PS check has ended
 {
 d->mCurrentStation->setPsType( RadioStation::Static );
 d->mCurrentStation->setName( d->mCurrentStation->dynamicPsText() );
 d->mCurrentStation->setDynamicPsText( "" );
 saveStation( *d->mCurrentStation );
-d->mUiEngine.monitor().notifyName( d->mCurrentStation->name() );
+d->mUiEngine.api().monitor().notifyName( d->mCurrentStation->name() );
 }
 }
 /*!
 * Checks the given station and emits signals based on what member variables had been changed

changeset 16	f54ebcfc1b80
parent 14	63aabac4416d
child 19	afea38384506