summaryrefslogtreecommitdiff
authorleseb <leseb>2002-07-13 10:01:40 (UTC)
committer leseb <leseb>2002-07-13 10:01:40 (UTC)
commit804c1ce9554548d1c0f46d28eb1b8f63b4341fdb (patch) (side-by-side diff)
tree45145247dfdb3725d57048082083a0c0b141d6f1
parentd38e47a3b39d84fe3758ebac9dd9af916bb9eb5a (diff)
downloadopie-804c1ce9554548d1c0f46d28eb1b8f63b4341fdb.zip
opie-804c1ce9554548d1c0f46d28eb1b8f63b4341fdb.tar.gz
opie-804c1ce9554548d1c0f46d28eb1b8f63b4341fdb.tar.bz2
Fix config read
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/styles/theme/othemebase.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/noncore/styles/theme/othemebase.cpp b/noncore/styles/theme/othemebase.cpp
index 00cea03..21d16f2 100644
--- a/noncore/styles/theme/othemebase.cpp
+++ b/noncore/styles/theme/othemebase.cpp
@@ -943,66 +943,70 @@ void OThemeBase::applyResourceGroup( Config *config, int i, QString *copyfrom, Q
}
else
colors[ i ] = NULL;
// Pixmap
tmpStr = config->readEntry( "Pixmap", "" );
pixnames[ i ] = tmpStr;
duplicate[ i ] = false;
pixmaps[ i ] = NULL;
images[ i ] = NULL;
// Pixmap border
tmpStr = config->readEntry( "PixmapBorder", "" );
brdnames[ i ] = tmpStr;
pbDuplicate[ i ] = false;
pbPixmaps[ i ] = NULL;
pbWidth[ i ] = 0;
if ( !tmpStr.isEmpty() ) {
pbWidth[ i ] = config->readNumEntry( "PixmapBWidth", 0 );
if ( pbWidth[ i ] == 0 ) {
qDebug ( "OThemeBase: No border width specified for pixmapped border widget %s\n", widgetEntries[ i ] );
qDebug ( "OThemeBase: Using default of 2.\n" );
pbWidth[ i ] = 2;
}
}
// Various widget specific settings. This was more efficent when bunched
// together in the misc group, but this makes an easier to read config.
if ( i == SliderGroove )
roundedSlider = config->readBoolEntry( "SmallGroove", false );
- else if ( i == ActiveTab || i == InactiveTab )
- aTabLine = iTabLine = config->readBoolEntry( "BottomLine", true );
+ else if ( i == ActiveTab ) {
+ aTabLine = config->readBoolEntry( "BottomLine", true );
+ }
+ else if ( i == InactiveTab ) {
+ iTabLine = config->readBoolEntry( "BottomLine", true );
+ }
else if ( i == Splitter )
splitterWidth = config->readNumEntry( "Width", 10 );
else if ( i == ComboBox || i == ComboBoxDown ) {
roundedCombo = config->readBoolEntry( "Round", false );
}
else if ( i == PushButton || i == PushButtonDown ) {
btnXShift = config->readNumEntry( "XShift", 0 );
btnYShift = config->readNumEntry( "YShift", 0 );
focus3D = config->readBoolEntry( "3DFocusRect", false );
focus3DOffset = config->readBoolEntry( "3DFocusOffset", 0 );
roundedButton = config->readBoolEntry( "Round", false );
}
}
void OThemeBase::readResourceGroup( int i, QString *copyfrom, QString *pixnames, QString *brdnames,
bool *loadArray )
{
if ( loadArray[ i ] == true ) {
return ; // already been preloaded.
}
int tmpVal;
QString tmpStr;
tmpStr = copyfrom [ i ];
if ( !tmpStr.isEmpty() ) { // Duplicate another widget's config
int sIndex;
loadArray[ i ] = true;
for ( sIndex = 0; sIndex < WIDGETS; ++sIndex ) {
if ( tmpStr == widgetEntries[ sIndex ] ) {
if ( !loadArray[ sIndex ] ) // hasn't been loaded yet