#include "style-manager-impl.h"
// EXTERNAL INCLUDES
-#include <fstream>
-#include <iostream>
-#include <sstream>
-#include <dali/public-api/adaptor-framework/singleton-service.h>
+#include <dali/devel-api/adaptor-framework/singleton-service.h>
#include <dali/public-api/object/type-registry.h>
-#include <dali/public-api/object/type-registry-helper.h>
+#include <dali/devel-api/object/type-registry-helper.h>
#include <dali/integration-api/debug.h>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/control.h>
#include <dali-toolkit/public-api/controls/control-impl.h>
-#include <dali-toolkit/public-api/styling/style-manager.h>
+#include <dali-toolkit/devel-api/styling/style-manager.h>
+#include <dali-toolkit/internal/feedback/feedback-style.h>
namespace
{
const char* PORTRAIT_QUALIFIER = "portrait";
const char* FONT_SIZE_QUALIFIER = "font-size-";
-const char* DEFAULT_THEME = DALI_STYLE_DIR "tizen-default-theme.json";
+const char* DEFAULT_THEME = DALI_STYLE_DIR "dali-toolkit-default-theme.json";
const char* PACKAGE_PATH_KEY = "PACKAGE_PATH";
const char* DEFAULT_PACKAGE_PATH = DALI_DATA_READ_ONLY_DIR "/toolkit/";
StyleManager::StyleManager()
: mOrientationDegrees( 0 ), // Portrait
- mDefaultFontSize( -1 )
+ mDefaultFontSize( -1 ),
+ mThemeFile( DEFAULT_THEME ),
+ mFeedbackStyle( NULL )
{
// Add theme builder constants
mThemeBuilderConstants[ PACKAGE_PATH_KEY ] = DEFAULT_PACKAGE_PATH;
- RequestDefaultTheme();
-
- StyleMonitor styleMonitor( StyleMonitor::Get() );
- if( styleMonitor )
+ mStyleMonitor = StyleMonitor::Get();
+ if( mStyleMonitor )
{
- styleMonitor.StyleChangeSignal().Connect( this, &StyleManager::StyleMonitorChange );
+ mStyleMonitor.StyleChangeSignal().Connect( this, &StyleManager::StyleMonitorChange );
- mDefaultFontSize = styleMonitor.GetDefaultFontSize();
+ mDefaultFontSize = mStyleMonitor.GetDefaultFontSize();
}
+
+ // Sound & haptic style
+ mFeedbackStyle = new FeedbackStyle();
+
}
StyleManager::~StyleManager()
{
+ delete mFeedbackStyle;
}
void StyleManager::SetOrientationValue( int orientation )
void StyleManager::ApplyStyle( Toolkit::Builder builder, Toolkit::Control control )
{
std::string styleName = control.GetStyleName();
+
if( styleName.empty() )
{
// Convert control name to lower case
void StyleManager::ApplyThemeStyle( Toolkit::Control control )
{
+ if( !mThemeBuilder )
+ {
+ RequestDefaultTheme();
+ }
+
if( mThemeBuilder )
{
ApplyStyle( mThemeBuilder, control );
}
}
+void StyleManager::ApplyThemeStyleAtInit( Toolkit::Control control )
+{
+ ApplyThemeStyle( control );
+
+ if(mFeedbackStyle)
+ {
+ mFeedbackStyle->ObjectCreated( control );
+ }
+}
+
void StyleManager::ApplyStyle( Toolkit::Control control, const std::string& jsonFileName, const std::string& styleName )
{
bool builderReady = false;
{
DALI_ASSERT_DEBUG( 0 != filename.length());
- std::ifstream in( filename.c_str(), std::ios::in );
- if( in )
+ // as toolkit is platform agnostic, it cannot load files from filesystem
+ // ask style monitor to load the style sheet
+ if( mStyleMonitor )
{
- std::stringstream buffer;
- buffer << in.rdbuf();
-
- stringOut = buffer.str();
-
- in.close();
-
- return true;
+ return mStyleMonitor.LoadThemeFile( filename, stringOut );
}
return false;
void StyleManager::SetTheme()
{
mThemeBuilder = CreateBuilder( mThemeBuilderConstants );
- if ( LoadJSON( mThemeBuilder, mThemeFile ) )
+
+ if( LoadJSON( mThemeBuilder, mThemeFile ) )
{
- StyleChange change;
- change.themeChange = true;
- mStyleChangeSignal.Emit( Toolkit::StyleManager::Get(), change );
+ if(mFeedbackStyle)
+ {
+ mFeedbackStyle->StyleChanged( mThemeFile, StyleChange::THEME_CHANGE );
+ }
+
+ mStyleChangeSignal.Emit( Toolkit::StyleManager::Get(), StyleChange::THEME_CHANGE );
}
else
{
mBuilderCache[ key ] = builder;
}
-void StyleManager::StyleMonitorChange( StyleMonitor styleMonitor, StyleChange styleChange )
+void StyleManager::StyleMonitorChange( StyleMonitor styleMonitor, StyleChange::Type styleChange )
{
- if( styleChange.defaultFontSizeChange )
+ switch ( styleChange )
{
- mDefaultFontSize = styleMonitor.GetDefaultFontSize();
+ case StyleChange::DEFAULT_FONT_CHANGE:
+ {
+ break;
+ }
+
+ case StyleChange::DEFAULT_FONT_SIZE_CHANGE:
+ {
+ mDefaultFontSize = styleMonitor.GetDefaultFontSize();
+ break;
+ }
+
+ case StyleChange::THEME_CHANGE:
+ {
+ const std::string& newTheme = styleMonitor.GetTheme();
+ if( ! newTheme.empty() )
+ {
+ mThemeFile = newTheme;
+ }
+ else
+ {
+ mThemeFile = DEFAULT_THEME;
+ }
+
+ SetTheme();
+ break;
+ }
}
mStyleChangeSignal.Emit( Toolkit::StyleManager::Get(), styleChange );