-rw-r--r-- | library/qpeapplication.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp index a54fb20..c8e6e74 100644 --- a/library/qpeapplication.cpp +++ b/library/qpeapplication.cpp | |||
@@ -894,28 +894,28 @@ void QPEApplication::setDefaultRotation( int r ) | |||
894 | e << r; | 894 | e << r; |
895 | } | 895 | } |
896 | #endif | 896 | #endif |
897 | 897 | ||
898 | } | 898 | } |
899 | } | 899 | } |
900 | 900 | ||
901 | // exported to libpreload.so | 901 | // exported to libpreload.so |
902 | bool opie_block_style = false; | 902 | int opie_block_style = 0; |
903 | 903 | ||
904 | /*! | 904 | /*! |
905 | \internal | 905 | \internal |
906 | */ | 906 | */ |
907 | void QPEApplication::applyStyle() | 907 | void QPEApplication::applyStyle() |
908 | { | 908 | { |
909 | Config config( "qpe" ); | 909 | Config config( "qpe" ); |
910 | config.setGroup( "Appearance" ); | 910 | config.setGroup( "Appearance" ); |
911 | 911 | ||
912 | // don't block ourselves ... | 912 | // don't block ourselves ... |
913 | opie_block_style = false; | 913 | opie_block_style = 0; |
914 | 914 | ||
915 | 915 | ||
916 | static QString appname; | 916 | static QString appname; |
917 | 917 | ||
918 | if ( appname. isNull ( )) { | 918 | if ( appname. isNull ( )) { |
919 | char src [32]; | 919 | char src [32]; |
920 | char dst [PATH_MAX + 1]; | 920 | char dst [PATH_MAX + 1]; |
921 | ::sprintf ( src, "/proc/%d/exe", ::getpid ( )); | 921 | ::sprintf ( src, "/proc/%d/exe", ::getpid ( )); |
@@ -970,16 +970,18 @@ void QPEApplication::applyStyle() | |||
970 | 970 | ||
971 | // Window Decoration | 971 | // Window Decoration |
972 | QString dec = config.readEntry( "Decoration", "Qtopia" ); | 972 | QString dec = config.readEntry( "Decoration", "Qtopia" ); |
973 | 973 | ||
974 | // don't set a custom deco | 974 | // don't set a custom deco |
975 | if ( nostyle & 0x04 ) | 975 | if ( nostyle & 0x04 ) |
976 | dec = ""; | 976 | dec = ""; |
977 | 977 | ||
978 | //qDebug ( "Setting Deco: %s -- old %s (%d)", dec.latin1(), d-> decorationName.latin1(), nostyle); | ||
979 | |||
978 | if ( dec != d->decorationName ) { | 980 | if ( dec != d->decorationName ) { |
979 | qwsSetDecoration( new QPEDecoration( dec ) ); | 981 | qwsSetDecoration( new QPEDecoration( dec ) ); |
980 | d->decorationName = dec; | 982 | d->decorationName = dec; |
981 | } | 983 | } |
982 | 984 | ||
983 | // Font | 985 | // Font |
984 | QString ff = config.readEntry( "FontFamily", font().family() ); | 986 | QString ff = config.readEntry( "FontFamily", font().family() ); |
985 | int fs = config.readNumEntry( "FontSize", font().pointSize() ); | 987 | int fs = config.readNumEntry( "FontSize", font().pointSize() ); |
@@ -988,17 +990,18 @@ void QPEApplication::applyStyle() | |||
988 | if ( nostyle & 0x02 ) { | 990 | if ( nostyle & 0x02 ) { |
989 | ff = "Helvetica"; | 991 | ff = "Helvetica"; |
990 | fs = 10; | 992 | fs = 10; |
991 | } | 993 | } |
992 | 994 | ||
993 | setFont( QFont(ff, fs) ); | 995 | setFont( QFont(ff, fs) ); |
994 | 996 | ||
995 | // revert to global blocking policy ... | 997 | // revert to global blocking policy ... |
996 | opie_block_style = config. readBoolEntry ( "ForceStyle", false ); | 998 | opie_block_style = config. readBoolEntry ( "ForceStyle", false ) ? 0xff : 0x00; |
999 | opie_block_style -= nostyle; | ||
997 | } | 1000 | } |
998 | 1001 | ||
999 | void QPEApplication::systemMessage( const QCString& msg, const QByteArray& data ) | 1002 | void QPEApplication::systemMessage( const QCString& msg, const QByteArray& data ) |
1000 | { | 1003 | { |
1001 | #ifdef Q_WS_QWS | 1004 | #ifdef Q_WS_QWS |
1002 | QDataStream stream( data, IO_ReadOnly ); | 1005 | QDataStream stream( data, IO_ReadOnly ); |
1003 | if ( msg == "applyStyle()" ) { | 1006 | if ( msg == "applyStyle()" ) { |
1004 | applyStyle(); | 1007 | applyStyle(); |