X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=adaptors%2Fcommon%2Fapplication-impl.h;h=b7e4bb2627cf23453b21b7b34e0014b28e586232;hb=ae37a5866286d97378c956ff9b55efb0e8c565e8;hp=621facce51d9bc2082b4f97653c786c3360c4f5f;hpb=069115710154dd741a6f3e6efce89a71ce79ebd3;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git diff --git a/adaptors/common/application-impl.h b/adaptors/common/application-impl.h index 621facc..b7e4bb2 100644 --- a/adaptors/common/application-impl.h +++ b/adaptors/common/application-impl.h @@ -24,6 +24,7 @@ // INTERNAL INCLUDES #include +#include #include #include @@ -125,6 +126,16 @@ public: Dali::Window GetWindow(); /** + * @copydoc Dali::DevelApplication::GetRegion(); + */ + std::string GetRegion(); + + /** + * @copydoc Dali::DevelApplication::GetLanguage(); + */ + std::string GetLanguage(); + + /** * @copydoc Dali::Application::ReplaceWindow(); */ void ReplaceWindow( const PositionSize& positionSize, const std::string& name); @@ -231,22 +242,22 @@ public: // From Framework::Observer /** * Called when the framework informs the application that the language of the device has changed. */ - virtual void OnLanguageChanged(); + virtual void OnLanguageChanged( const std::string& language ); /** * Called when the framework informs the application that the region of the device has changed. */ - virtual void OnRegionChanged(); + virtual void OnRegionChanged( const std::string& region ); /** * Called when the framework informs the application that the battery level of the device is low. */ - virtual void OnBatteryLow(); + virtual void OnBatteryLow( Dali::DevelApplication::BatteryStatus::Type status ); /** * Called when the framework informs the application that the memory level of the device is low. */ - virtual void OnMemoryLow(); + virtual void OnMemoryLow( Dali::DevelApplication::MemoryStatus::Type status ); public: @@ -320,6 +331,16 @@ public: // Signals */ Dali::Application::AppSignalType& MemoryLowSignal() { return mMemoryLowSignal; } + /** + * @copydoc Dali::DevelApplication::LowBatterySignal() + */ + Dali::DevelApplication::LowBatterySignalType& LowBatterySignal() { return mLowBatterySignal; } + + /** + * @copydoc Dali::DevelApplication:::LowMemorySignal() + */ + Dali::DevelApplication::LowMemorySignalType& LowMemorySignal() { return mLowMemorySignal; } + protected: /** @@ -360,17 +381,19 @@ protected: private: - AppSignalType mInitSignal; - AppSignalType mTerminateSignal; - AppSignalType mPauseSignal; - AppSignalType mResumeSignal; - AppSignalType mResetSignal; - AppSignalType mResizeSignal; - AppControlSignalType mAppControlSignal; - AppSignalType mLanguageChangedSignal; - AppSignalType mRegionChangedSignal; - AppSignalType mBatteryLowSignal; - AppSignalType mMemoryLowSignal; + AppSignalType mInitSignal; + AppSignalType mTerminateSignal; + AppSignalType mPauseSignal; + AppSignalType mResumeSignal; + AppSignalType mResetSignal; + AppSignalType mResizeSignal; + AppControlSignalType mAppControlSignal; + AppSignalType mLanguageChangedSignal; + AppSignalType mRegionChangedSignal; + AppSignalType mBatteryLowSignal; + AppSignalType mMemoryLowSignal; + Dali::DevelApplication::LowBatterySignalType mLowBatterySignal; + Dali::DevelApplication::LowMemorySignalType mLowMemorySignal; EventLoop* mEventLoop; Framework* mFramework; @@ -378,16 +401,18 @@ private: Dali::Configuration::ContextLoss mContextLossConfiguration; CommandLineOptions* mCommandLineOptions; - Dali::SingletonService mSingletonService; - Dali::Adaptor* mAdaptor; - Dali::Window mWindow; - Dali::Application::WINDOW_MODE mWindowMode; - std::string mName; - std::string mStylesheet; - EnvironmentOptions mEnvironmentOptions; - PositionSize mWindowPositionSize; - Launchpad::State mLaunchpadState; - bool mUseRemoteSurface; + Dali::SingletonService mSingletonService; + Dali::Adaptor* mAdaptor; + Dali::Window mWindow; + Dali::Application::WINDOW_MODE mWindowMode; + std::string mName; + std::string mStylesheet; + std::string mLanguage; + std::string mRegion; + EnvironmentOptions mEnvironmentOptions; + PositionSize mWindowPositionSize; + Launchpad::State mLaunchpadState; + bool mUseRemoteSurface; SlotDelegate< Application > mSlotDelegate;