author | leseb <leseb> | 2002-07-13 10:01:40 (UTC) |
---|---|---|
committer | leseb <leseb> | 2002-07-13 10:01:40 (UTC) |
commit | 804c1ce9554548d1c0f46d28eb1b8f63b4341fdb (patch) (unidiff) | |
tree | 45145247dfdb3725d57048082083a0c0b141d6f1 | |
parent | d38e47a3b39d84fe3758ebac9dd9af916bb9eb5a (diff) | |
download | opie-804c1ce9554548d1c0f46d28eb1b8f63b4341fdb.zip opie-804c1ce9554548d1c0f46d28eb1b8f63b4341fdb.tar.gz opie-804c1ce9554548d1c0f46d28eb1b8f63b4341fdb.tar.bz2 |
Fix config read
-rw-r--r-- | noncore/styles/theme/othemebase.cpp | 8 |
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 | |||
943 | } | 943 | } |
944 | else | 944 | else |
945 | colors[ i ] = NULL; | 945 | colors[ i ] = NULL; |
946 | 946 | ||
947 | // Pixmap | 947 | // Pixmap |
948 | tmpStr = config->readEntry( "Pixmap", "" ); | 948 | tmpStr = config->readEntry( "Pixmap", "" ); |
949 | pixnames[ i ] = tmpStr; | 949 | pixnames[ i ] = tmpStr; |
950 | duplicate[ i ] = false; | 950 | duplicate[ i ] = false; |
951 | pixmaps[ i ] = NULL; | 951 | pixmaps[ i ] = NULL; |
952 | images[ i ] = NULL; | 952 | images[ i ] = NULL; |
953 | 953 | ||
954 | 954 | ||
955 | // Pixmap border | 955 | // Pixmap border |
956 | tmpStr = config->readEntry( "PixmapBorder", "" ); | 956 | tmpStr = config->readEntry( "PixmapBorder", "" ); |
957 | brdnames[ i ] = tmpStr; | 957 | brdnames[ i ] = tmpStr; |
958 | pbDuplicate[ i ] = false; | 958 | pbDuplicate[ i ] = false; |
959 | pbPixmaps[ i ] = NULL; | 959 | pbPixmaps[ i ] = NULL; |
960 | pbWidth[ i ] = 0; | 960 | pbWidth[ i ] = 0; |
961 | if ( !tmpStr.isEmpty() ) { | 961 | if ( !tmpStr.isEmpty() ) { |
962 | pbWidth[ i ] = config->readNumEntry( "PixmapBWidth", 0 ); | 962 | pbWidth[ i ] = config->readNumEntry( "PixmapBWidth", 0 ); |
963 | if ( pbWidth[ i ] == 0 ) { | 963 | if ( pbWidth[ i ] == 0 ) { |
964 | qDebug ( "OThemeBase: No border width specified for pixmapped border widget %s\n", widgetEntries[ i ] ); | 964 | qDebug ( "OThemeBase: No border width specified for pixmapped border widget %s\n", widgetEntries[ i ] ); |
965 | qDebug ( "OThemeBase: Using default of 2.\n" ); | 965 | qDebug ( "OThemeBase: Using default of 2.\n" ); |
966 | pbWidth[ i ] = 2; | 966 | pbWidth[ i ] = 2; |
967 | } | 967 | } |
968 | } | 968 | } |
969 | 969 | ||
970 | 970 | ||
971 | // Various widget specific settings. This was more efficent when bunched | 971 | // Various widget specific settings. This was more efficent when bunched |
972 | // together in the misc group, but this makes an easier to read config. | 972 | // together in the misc group, but this makes an easier to read config. |
973 | if ( i == SliderGroove ) | 973 | if ( i == SliderGroove ) |
974 | roundedSlider = config->readBoolEntry( "SmallGroove", false ); | 974 | roundedSlider = config->readBoolEntry( "SmallGroove", false ); |
975 | else if ( i == ActiveTab || i == InactiveTab ) | 975 | else if ( i == ActiveTab ) { |
976 | aTabLine = iTabLine = config->readBoolEntry( "BottomLine", true ); | 976 | aTabLine = config->readBoolEntry( "BottomLine", true ); |
977 | } | ||
978 | else if ( i == InactiveTab ) { | ||
979 | iTabLine = config->readBoolEntry( "BottomLine", true ); | ||
980 | } | ||
977 | else if ( i == Splitter ) | 981 | else if ( i == Splitter ) |
978 | splitterWidth = config->readNumEntry( "Width", 10 ); | 982 | splitterWidth = config->readNumEntry( "Width", 10 ); |
979 | else if ( i == ComboBox || i == ComboBoxDown ) { | 983 | else if ( i == ComboBox || i == ComboBoxDown ) { |
980 | roundedCombo = config->readBoolEntry( "Round", false ); | 984 | roundedCombo = config->readBoolEntry( "Round", false ); |
981 | } | 985 | } |
982 | else if ( i == PushButton || i == PushButtonDown ) { | 986 | else if ( i == PushButton || i == PushButtonDown ) { |
983 | btnXShift = config->readNumEntry( "XShift", 0 ); | 987 | btnXShift = config->readNumEntry( "XShift", 0 ); |
984 | btnYShift = config->readNumEntry( "YShift", 0 ); | 988 | btnYShift = config->readNumEntry( "YShift", 0 ); |
985 | focus3D = config->readBoolEntry( "3DFocusRect", false ); | 989 | focus3D = config->readBoolEntry( "3DFocusRect", false ); |
986 | focus3DOffset = config->readBoolEntry( "3DFocusOffset", 0 ); | 990 | focus3DOffset = config->readBoolEntry( "3DFocusOffset", 0 ); |
987 | roundedButton = config->readBoolEntry( "Round", false ); | 991 | roundedButton = config->readBoolEntry( "Round", false ); |
988 | } | 992 | } |
989 | } | 993 | } |
990 | 994 | ||
991 | 995 | ||
992 | void OThemeBase::readResourceGroup( int i, QString *copyfrom, QString *pixnames, QString *brdnames, | 996 | void OThemeBase::readResourceGroup( int i, QString *copyfrom, QString *pixnames, QString *brdnames, |
993 | bool *loadArray ) | 997 | bool *loadArray ) |
994 | { | 998 | { |
995 | if ( loadArray[ i ] == true ) { | 999 | if ( loadArray[ i ] == true ) { |
996 | return ; // already been preloaded. | 1000 | return ; // already been preloaded. |
997 | } | 1001 | } |
998 | 1002 | ||
999 | int tmpVal; | 1003 | int tmpVal; |
1000 | QString tmpStr; | 1004 | QString tmpStr; |
1001 | 1005 | ||
1002 | tmpStr = copyfrom [ i ]; | 1006 | tmpStr = copyfrom [ i ]; |
1003 | if ( !tmpStr.isEmpty() ) { // Duplicate another widget's config | 1007 | if ( !tmpStr.isEmpty() ) { // Duplicate another widget's config |
1004 | int sIndex; | 1008 | int sIndex; |
1005 | loadArray[ i ] = true; | 1009 | loadArray[ i ] = true; |
1006 | for ( sIndex = 0; sIndex < WIDGETS; ++sIndex ) { | 1010 | for ( sIndex = 0; sIndex < WIDGETS; ++sIndex ) { |
1007 | if ( tmpStr == widgetEntries[ sIndex ] ) { | 1011 | if ( tmpStr == widgetEntries[ sIndex ] ) { |
1008 | if ( !loadArray[ sIndex ] ) // hasn't been loaded yet | 1012 | if ( !loadArray[ sIndex ] ) // hasn't been loaded yet |