summaryrefslogtreecommitdiff
path: root/vcl/unx/kde
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2007-06-04 13:58:45 +0000
committerIvo Hinkelmann <ihi@openoffice.org>2007-06-04 13:58:45 +0000
commit29376c7c7dae5a81ee23c135e4f473a19f07a1d7 (patch)
tree20ba3ed5bc666e03bf5f4e36047fcb7d7b090c39 /vcl/unx/kde
parent7ee5231af25fe967e77d68c6b9ee112555242c7c (diff)
INTEGRATION: CWS enabletango (1.21.210); FILE MERGED
2007/05/29 13:44:56 pmladek 1.21.210.1: #i75661# read the default icon theme from the system in GNOME and KDE
Diffstat (limited to 'vcl/unx/kde')
-rw-r--r--vcl/unx/kde/salnativewidgets-kde.cxx17
1 files changed, 15 insertions, 2 deletions
diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx b/vcl/unx/kde/salnativewidgets-kde.cxx
index 753176785371..48695be6ebdd 100644
--- a/vcl/unx/kde/salnativewidgets-kde.cxx
+++ b/vcl/unx/kde/salnativewidgets-kde.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: salnativewidgets-kde.cxx,v $
*
- * $Revision: 1.21 $
+ * $Revision: 1.22 $
*
- * last change: $Author: obo $ $Date: 2006-10-13 08:33:36 $
+ * last change: $Author: ihi $ $Date: 2007-06-04 14:58:45 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -1718,6 +1718,13 @@ static Color toColor( const QColor &rColor )
return Color( rColor.red(), rColor.green(), rColor.blue() );
}
+/** Helper function to read untranslated text entry from KConfig configuration repository.
+*/
+static OUString readEntryUntranslated( KConfig *pConfig, const char *pKey )
+{
+ return OUString::createFromAscii( pConfig->readEntryUntranslated( pKey ).ascii() );
+}
+
/** Helper function to read color from KConfig configuration repository.
*/
static Color readColor( KConfig *pConfig, const char *pKey )
@@ -1862,6 +1869,12 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
aStyleSettings.SetTitleFont( aFont );
bSetTitleFont = true;
}
+
+ pConfig->setGroup( "Icons" );
+
+ pKey = "Theme";
+ if ( pConfig->hasKey( pKey ) )
+ aStyleSettings.SetPreferredSymbolsStyleName( readEntryUntranslated( pConfig, pKey ) );
}
// General settings