--- a/radioapp/radiowidgets/inc/radiomainview.h Fri Jun 11 16:24:13 2010 +0100
+++ b/radioapp/radiowidgets/inc/radiomainview.h Thu Jul 22 16:33:45 2010 +0100
@@ -23,7 +23,6 @@
// User includes
#include "radioviewbase.h"
-#include "radiowidgetsexport.h"
// Forward declarations
class RadioWindow;
@@ -33,9 +32,10 @@
class RadioFrequencyScanner;
class RadioStationCarousel;
class RadioFrequencyStrip;
+class RadioStation;
// Class declaration
-class WIDGETS_DLL_EXPORT RadioMainView : public RadioViewBase
+class RadioMainView : public RadioViewBase
{
Q_OBJECT
@@ -46,29 +46,54 @@
void setScanningMode( bool scanning );
+signals:
+
+ void applicationReady();
+
private slots:
- void setFrequencyFromWidget( uint frequency, int reason );
+ void setFrequencyFromWidget( uint frequency, int reason, int direction );
void setFrequencyFromEngine( uint frequency, int reason );
void skip( int skipMode );
+ void openStationsView();
void toggleScanning();
+ void toggleFavorite();
void seekingStarted();
+ void updateAntennaStatus( bool connected );
void updateAudioRoute( bool loudspeaker );
+ void setManualSeekMode( bool manualSeekActive );
+ void handleFavoriteChange( const RadioStation& station );
+ void saveActivity();
+
+ void toggleSkippingMode(); //TODO: Remove. Temporary test code
+ void resetFirstTimeCount(); //TODO: Remove. Temporary test code
private:
// from base class RadioViewBase
+ void preLazyLoadInit();
void init();
void setOrientation();
void userAccepted();
+// from base class QObject
+
+ bool eventFilter( QObject* watched, QEvent* event );
+
+// New functions
+
+ void updateFavoriteButton();
+
private: // data
QScopedPointer<RadioFrequencyScanner> mFrequencyScanner;
RadioStationCarousel* mCarousel;
RadioFrequencyStrip* mFrequencyStrip;
+ HbAction* mSkippingAction; //TODO: Remove. Temporary test code
+ bool mAlternateSkipping; //TODO: Remove. Temporary test code
+
};
#endif // RADIOMAINVIEW_H