diff options
| author | Rachit Gupta <rachitgupta1792@gmail.com> | 2014-06-19 18:49:36 +0530 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2014-08-14 19:43:28 +0200 |
| commit | 27f4c752d062df6c3f9c33c62e5de7c541aeca34 (patch) | |
| tree | f51c878c5c0fff399e3ee809950c90be74655c2a /vcl | |
| parent | 6f2136f5832c449d1f4eaa11e089e473ce94c964 (diff) | |
Added functionality to apply default themes.
* The themes are stored in the share folder under the personas directory
in the gallery. The information is stored in a personas_list.txt which
contains the info in the form headerFile;footerFile;textColor;AccentColor
for the default themes.
* Changed the personalization_tab.ui to include _three_ buttons to show
the default images.
* Changed the vcl/source/app/settings.cxx to read the persona information
properly in the case of default personas.
* Some variable name changes.
Change-Id: Ib5f2167729a5fb7eb8061925679560accb934a44
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/app/settings.cxx | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index 1c300d3ea7e2..42787205e5fa 100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx @@ -2096,7 +2096,6 @@ static BitmapEx readBitmapEx( const OUString& rPath ) Graphic aGraphic; if ( GraphicFilter::LoadGraphic( aPath, OUString(), aGraphic ) != GRFILTER_OK ) return BitmapEx(); - return aGraphic.GetBitmapEx(); } @@ -2128,7 +2127,7 @@ static void setupPersonaHeaderFooter( WhichPersona eWhich, OUString& rHeaderFoot // now read the new values and setup bitmaps OUString aHeader, aFooter; - if ( aPersona == "own" ) + if ( aPersona == "own" || aPersona == "default" ) { sal_Int32 nIndex = 0; aHeader = aPersonaSettings.getToken( 0, ';', nIndex ); @@ -2142,11 +2141,6 @@ static void setupPersonaHeaderFooter( WhichPersona eWhich, OUString& rHeaderFoot rMenuBarTextColor = Color( aColor.toUInt64( 16 ) ); } } - else if ( aPersona == "default" ) - { - aHeader = "header.jpg"; - aFooter = "footer.jpg"; - } OUString aName; switch ( eWhich ) { |