diff -r f683e24efca3 -r 608f67c22514 qtinternetradio/ui/src/main.cpp --- a/qtinternetradio/ui/src/main.cpp Wed Jun 23 18:04:00 2010 +0300 +++ b/qtinternetradio/ui/src/main.cpp Tue Jul 06 14:07:20 2010 +0300 @@ -18,12 +18,16 @@ #include #include #include +#include +#include #include "irviewmanager.h" #include "irapplication.h" #include "irmemorycollector.h" #include "irqlogger.h" #include "irqsystemeventhandler.h" +#include "irqsettings.h" +#include "irservicedef.h" #ifdef LOCALIZATION #include @@ -32,12 +36,18 @@ bool isDiskSpaceLow(IRQSystemEventHandler* aEventHandler); bool isSecondInstance(); +void setSplashScreen(); +bool isSplashNowplaying(); int main(int argc, char* argv[]) { installLogDir(); INSTALL_MESSAGE_HANDLER; + //the following is for splash screen, this must be placed + //before the creating of HbApplication + setSplashScreen(); + HbApplication app(argc, argv); #ifdef LOCALIZATION @@ -46,7 +56,11 @@ Q_ASSERT( NULL != translator ); #endif +#ifdef SUBTITLE_STR_BY_LOCID QCoreApplication::setApplicationName(hbTrId("txt_irad_title_internet_radio")); +#else + QCoreApplication::setApplicationName(hbTrId("Internet radio")); +#endif if (isSecondInstance()) { return 0; @@ -89,8 +103,13 @@ bool ret = aEventHandler->isBelowCriticalLevel(); if(ret) { - HbDeviceMessageBox messageBox(hbTrId("txt_irad_info_no_space_on_c_drive_internet_radio_closed"), +#ifdef SUBTITLE_STR_BY_LOCID + HbDeviceMessageBox messageBox(hbTrId("txt_irad_info_insufficient_disk_space"), HbMessageBox::MessageTypeWarning); +#else + HbDeviceMessageBox messageBox(hbTrId("Insufficient disk space"), + HbMessageBox::MessageTypeWarning); +#endif messageBox.setTimeout(HbPopup::NoTimeout); messageBox.exec(); } @@ -123,3 +142,22 @@ return false; } } + +void setSplashScreen() +{ + if( isSplashNowplaying() ) + { + HbSplashScreen::setScreenId("nowplaying_screen"); + } + else + { + HbSplashScreen::setScreenId("normal_screen"); + } +} + +bool isSplashNowplaying() +{ + QSettings settings(KIrSettingOrganization, KIrSettingApplication); + return settings.value(KIrSettingSplashNowplaying,false).toBool(); +} +