namespace
{
-const char* LANDSCAPE_QUALIFIER = "landscape";
+//const char* LANDSCAPE_QUALIFIER = "landscape";
const char* PORTRAIT_QUALIFIER = "portrait";
const char* FONT_SIZE_QUALIFIER = "fontsize";
void StyleManager::ApplyDefaultTheme()
{
- std::string empty;
- SetTheme( empty );
+ SetTheme( DEFAULT_THEME );
}
const std::string& StyleManager::GetDefaultFontFamily() const
// Always load the default theme first, then merge in the custom theme if present
themeLoaded = LoadJSON( mThemeBuilder, DEFAULT_THEME );
+ mThemeFile = themeFile;
- if( ! themeFile.empty() )
+ if( themeFile.compare(DEFAULT_THEME) != 0 )
{
- mThemeFile = themeFile;
themeLoaded = LoadJSON( mThemeBuilder, mThemeFile );
}
static void CollectQualifiers( std::vector<std::string>& qualifiersOut )
{
// Append the relevant qualifier for orientation
- int orientation = 0; // Get the orientation from the system
- switch( orientation )
- {
- case 90:
- case 270:
- {
- qualifiersOut.push_back( std::string( LANDSCAPE_QUALIFIER ) );
- break;
- }
- case 180:
- case 0: // fall through
- default:
- {
- qualifiersOut.push_back( std::string( PORTRAIT_QUALIFIER ) );
- break;
- }
- }
+ // int orientation = 0; // Get the orientation from the system
+ /*
+ //// To Do /////
+ Getting orientation from the system, and determine Qualifie LANDSCAPE or PORTRAIT
+ orientation 0, 180 : PORTRAIT_QUALIFIER (default)
+ orientation 90, 270 : LANDSCAPE_QUALIFIER
+ */
+
+ qualifiersOut.push_back( std::string( PORTRAIT_QUALIFIER ) );
+
}
/**