-rw-r--r-- | library/qpeapplication.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp index 7463074..ac7b779 100644 --- a/library/qpeapplication.cpp +++ b/library/qpeapplication.cpp | |||
@@ -850,193 +850,193 @@ bool QPEApplication::qwsEventFilter( QWSEvent * e ) | |||
850 | } | 850 | } |
851 | else { | 851 | else { |
852 | // make sure our modal widget is ALWAYS on top | 852 | // make sure our modal widget is ALWAYS on top |
853 | QWidget *topm = activeModalWidget(); | 853 | QWidget *topm = activeModalWidget(); |
854 | if ( topm ) { | 854 | if ( topm ) { |
855 | topm->raise(); | 855 | topm->raise(); |
856 | } | 856 | } |
857 | } | 857 | } |
858 | if ( fe->simpleData.get_focus && inputMethodDict ) { | 858 | if ( fe->simpleData.get_focus && inputMethodDict ) { |
859 | InputMethodHint m = inputMethodHint( QWidget::find( e->window() ) ); | 859 | InputMethodHint m = inputMethodHint( QWidget::find( e->window() ) ); |
860 | if ( m == AlwaysOff ) | 860 | if ( m == AlwaysOff ) |
861 | Global::hideInputMethod(); | 861 | Global::hideInputMethod(); |
862 | if ( m == AlwaysOn ) | 862 | if ( m == AlwaysOn ) |
863 | Global::showInputMethod(); | 863 | Global::showInputMethod(); |
864 | } | 864 | } |
865 | } | 865 | } |
866 | return QApplication::qwsEventFilter( e ); | 866 | return QApplication::qwsEventFilter( e ); |
867 | } | 867 | } |
868 | #endif | 868 | #endif |
869 | 869 | ||
870 | /*! | 870 | /*! |
871 | Destroys the QPEApplication. | 871 | Destroys the QPEApplication. |
872 | */ | 872 | */ |
873 | QPEApplication::~QPEApplication() | 873 | QPEApplication::~QPEApplication() |
874 | { | 874 | { |
875 | ungrabKeyboard(); | 875 | ungrabKeyboard(); |
876 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) | 876 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) |
877 | // Need to delete QCopChannels early, since the display will | 877 | // Need to delete QCopChannels early, since the display will |
878 | // be gone by the time we get to ~QObject(). | 878 | // be gone by the time we get to ~QObject(). |
879 | delete sysChannel; | 879 | delete sysChannel; |
880 | delete pidChannel; | 880 | delete pidChannel; |
881 | #endif | 881 | #endif |
882 | 882 | ||
883 | delete d; | 883 | delete d; |
884 | } | 884 | } |
885 | 885 | ||
886 | /*! | 886 | /*! |
887 | Returns <tt>$OPIEDIR/</tt>. | 887 | Returns <tt>$OPIEDIR/</tt>. |
888 | */ | 888 | */ |
889 | QString QPEApplication::qpeDir() | 889 | QString QPEApplication::qpeDir() |
890 | { | 890 | { |
891 | const char * base = getenv( "OPIEDIR" ); | 891 | const char * base = getenv( "OPIEDIR" ); |
892 | if ( base ) | 892 | if ( base ) |
893 | return QString( base ) + "/"; | 893 | return QString( base ) + "/"; |
894 | 894 | ||
895 | return QString( "../" ); | 895 | return QString( "../" ); |
896 | } | 896 | } |
897 | 897 | ||
898 | /*! | 898 | /*! |
899 | Returns the user's current Document directory. There is a trailing "/". | 899 | Returns the user's current Document directory. There is a trailing "/". |
900 | .. well, it does now,, and there's no trailing '/' | 900 | .. well, it does now,, and there's no trailing '/' |
901 | */ | 901 | */ |
902 | QString QPEApplication::documentDir() | 902 | QString QPEApplication::documentDir() |
903 | { | 903 | { |
904 | const char* base = getenv( "HOME"); | 904 | const char* base = getenv( "HOME"); |
905 | if ( base ) | 905 | if ( base ) |
906 | return QString( base ) + "/Documents"; | 906 | return QString( base ) + "/Documents"; |
907 | 907 | ||
908 | return QString( "../Documents" ); | 908 | return QString( "../Documents" ); |
909 | } | 909 | } |
910 | 910 | ||
911 | static int deforient = -1; | 911 | static int deforient = -1; |
912 | 912 | ||
913 | /*! | 913 | /*! |
914 | \internal | 914 | \internal |
915 | */ | 915 | */ |
916 | int QPEApplication::defaultRotation() | 916 | int QPEApplication::defaultRotation() |
917 | { | 917 | { |
918 | if ( deforient < 0 ) { | 918 | if ( deforient < 0 ) { |
919 | QString d = getenv( "QWS_DISPLAY" ); | 919 | QString d = getenv( "QWS_DISPLAY" ); |
920 | if ( d.contains( "Rot90" ) ) { | 920 | if ( d.contains( "Rot90" ) ) { |
921 | deforient = 90; | 921 | deforient = 90; |
922 | } | 922 | } |
923 | else if ( d.contains( "Rot180" ) ) { | 923 | else if ( d.contains( "Rot180" ) ) { |
924 | deforient = 180; | 924 | deforient = 180; |
925 | } | 925 | } |
926 | else if ( d.contains( "Rot270" ) ) { | 926 | else if ( d.contains( "Rot270" ) ) { |
927 | deforient = 270; | 927 | deforient = 270; |
928 | } | 928 | } |
929 | else { | 929 | else { |
930 | deforient = 0; | 930 | deforient = 0; |
931 | } | 931 | } |
932 | } | 932 | } |
933 | return deforient; | 933 | return deforient; |
934 | } | 934 | } |
935 | 935 | ||
936 | /*! | 936 | /*! |
937 | \internal | 937 | \internal |
938 | */ | 938 | */ |
939 | void QPEApplication::setDefaultRotation( int r ) | 939 | void QPEApplication::setDefaultRotation( int r ) |
940 | { | 940 | { |
941 | if ( qApp->type() == GuiServer ) { | 941 | if ( qApp->type() == GuiServer ) { |
942 | deforient = r; | 942 | deforient = r; |
943 | setenv( "QWS_DISPLAY", QString( "Transformed:Rot%1:0" ).arg( r ).latin1(), 1 ); | 943 | setenv( "QWS_DISPLAY", QString( "Transformed:Rot%1:0" ).arg( r ).latin1(), 1 ); |
944 | Config config("qpe"); | 944 | Config config("qpe"); |
945 | config.setGroup( "Rotation" ); | 945 | config.setGroup( "Rotation" ); |
946 | config.writeEntry( "Screen", getenv("QWS_DISPLAY") ); | 946 | config.writeEntry( "Rot", r ); |
947 | } | 947 | } |
948 | else { | 948 | else { |
949 | #ifndef QT_NO_COP | 949 | #ifndef QT_NO_COP |
950 | { QCopEnvelope e( "QPE/System", "setDefaultRotation(int)" ); | 950 | { QCopEnvelope e( "QPE/System", "setDefaultRotation(int)" ); |
951 | e << r; | 951 | e << r; |
952 | } | 952 | } |
953 | #endif | 953 | #endif |
954 | 954 | ||
955 | } | 955 | } |
956 | } | 956 | } |
957 | 957 | ||
958 | 958 | ||
959 | /*! | 959 | /*! |
960 | \internal | 960 | \internal |
961 | */ | 961 | */ |
962 | void QPEApplication::applyStyle() | 962 | void QPEApplication::applyStyle() |
963 | { | 963 | { |
964 | Config config( "qpe" ); | 964 | Config config( "qpe" ); |
965 | config.setGroup( "Appearance" ); | 965 | config.setGroup( "Appearance" ); |
966 | 966 | ||
967 | // don't block ourselves ... | 967 | // don't block ourselves ... |
968 | Opie::force_appearance = 0; | 968 | Opie::force_appearance = 0; |
969 | 969 | ||
970 | static QString appname = Opie::binaryName ( ); | 970 | static QString appname = Opie::binaryName ( ); |
971 | 971 | ||
972 | QStringList ex = config. readListEntry ( "NoStyle", ';' ); | 972 | QStringList ex = config. readListEntry ( "NoStyle", ';' ); |
973 | int nostyle = 0; | 973 | int nostyle = 0; |
974 | for ( QStringList::Iterator it = ex. begin ( ); it != ex. end ( ); ++it ) { | 974 | for ( QStringList::Iterator it = ex. begin ( ); it != ex. end ( ); ++it ) { |
975 | if ( QRegExp (( *it ). mid ( 1 ), false, true ). find ( appname, 0 ) >= 0 ) { | 975 | if ( QRegExp (( *it ). mid ( 1 ), false, true ). find ( appname, 0 ) >= 0 ) { |
976 | nostyle = ( *it ). left ( 1 ). toInt ( 0, 32 ); | 976 | nostyle = ( *it ). left ( 1 ). toInt ( 0, 32 ); |
977 | break; | 977 | break; |
978 | } | 978 | } |
979 | } | 979 | } |
980 | 980 | ||
981 | // Widget style | 981 | // Widget style |
982 | QString style = config.readEntry( "Style", "Light" ); | 982 | QString style = config.readEntry( "Style", "Light" ); |
983 | 983 | ||
984 | // don't set a custom style | 984 | // don't set a custom style |
985 | if ( nostyle & Opie::Force_Style ) | 985 | if ( nostyle & Opie::Force_Style ) |
986 | style = "Light"; | 986 | style = "Light"; |
987 | 987 | ||
988 | internalSetStyle ( style ); | 988 | internalSetStyle ( style ); |
989 | 989 | ||
990 | // Colors | 990 | // Colors |
991 | QColor bgcolor( config.readEntry( "Background", "#E5E1D5" ) ); | 991 | QColor bgcolor( config.readEntry( "Background", "#E5E1D5" ) ); |
992 | QColor btncolor( config.readEntry( "Button", "#D6CDBB" ) ); | 992 | QColor btncolor( config.readEntry( "Button", "#D6CDBB" ) ); |
993 | QPalette pal( btncolor, bgcolor ); | 993 | QPalette pal( btncolor, bgcolor ); |
994 | QString color = config.readEntry( "Highlight", "#800000" ); | 994 | QString color = config.readEntry( "Highlight", "#800000" ); |
995 | pal.setColor( QColorGroup::Highlight, QColor( color ) ); | 995 | pal.setColor( QColorGroup::Highlight, QColor( color ) ); |
996 | color = config.readEntry( "HighlightedText", "#FFFFFF" ); | 996 | color = config.readEntry( "HighlightedText", "#FFFFFF" ); |
997 | pal.setColor( QColorGroup::HighlightedText, QColor( color ) ); | 997 | pal.setColor( QColorGroup::HighlightedText, QColor( color ) ); |
998 | color = config.readEntry( "Text", "#000000" ); | 998 | color = config.readEntry( "Text", "#000000" ); |
999 | pal.setColor( QColorGroup::Text, QColor( color ) ); | 999 | pal.setColor( QColorGroup::Text, QColor( color ) ); |
1000 | color = config.readEntry( "ButtonText", "#000000" ); | 1000 | color = config.readEntry( "ButtonText", "#000000" ); |
1001 | pal.setColor( QPalette::Active, QColorGroup::ButtonText, QColor( color ) ); | 1001 | pal.setColor( QPalette::Active, QColorGroup::ButtonText, QColor( color ) ); |
1002 | color = config.readEntry( "Base", "#FFFFFF" ); | 1002 | color = config.readEntry( "Base", "#FFFFFF" ); |
1003 | pal.setColor( QColorGroup::Base, QColor( color ) ); | 1003 | pal.setColor( QColorGroup::Base, QColor( color ) ); |
1004 | 1004 | ||
1005 | pal.setColor( QPalette::Disabled, QColorGroup::Text, | 1005 | pal.setColor( QPalette::Disabled, QColorGroup::Text, |
1006 | pal.color( QPalette::Active, QColorGroup::Background ).dark() ); | 1006 | pal.color( QPalette::Active, QColorGroup::Background ).dark() ); |
1007 | 1007 | ||
1008 | setPalette( pal, TRUE ); | 1008 | setPalette( pal, TRUE ); |
1009 | 1009 | ||
1010 | // Window Decoration | 1010 | // Window Decoration |
1011 | QString dec = config.readEntry( "Decoration", "Qtopia" ); | 1011 | QString dec = config.readEntry( "Decoration", "Qtopia" ); |
1012 | 1012 | ||
1013 | // don't set a custom deco | 1013 | // don't set a custom deco |
1014 | if ( nostyle & Opie::Force_Decoration ) | 1014 | if ( nostyle & Opie::Force_Decoration ) |
1015 | dec = ""; | 1015 | dec = ""; |
1016 | 1016 | ||
1017 | //qDebug ( "Setting Deco: %s -- old %s (%d)", dec.latin1(), d-> decorationName.latin1(), nostyle); | 1017 | //qDebug ( "Setting Deco: %s -- old %s (%d)", dec.latin1(), d-> decorationName.latin1(), nostyle); |
1018 | 1018 | ||
1019 | if ( dec != d->decorationName ) { | 1019 | if ( dec != d->decorationName ) { |
1020 | qwsSetDecoration( new QPEDecoration( dec ) ); | 1020 | qwsSetDecoration( new QPEDecoration( dec ) ); |
1021 | d->decorationName = dec; | 1021 | d->decorationName = dec; |
1022 | } | 1022 | } |
1023 | 1023 | ||
1024 | // Font | 1024 | // Font |
1025 | QString ff = config.readEntry( "FontFamily", font().family() ); | 1025 | QString ff = config.readEntry( "FontFamily", font().family() ); |
1026 | int fs = config.readNumEntry( "FontSize", font().pointSize() ); | 1026 | int fs = config.readNumEntry( "FontSize", font().pointSize() ); |
1027 | 1027 | ||
1028 | // don't set a custom font | 1028 | // don't set a custom font |
1029 | if ( nostyle & Opie::Force_Font ) { | 1029 | if ( nostyle & Opie::Force_Font ) { |
1030 | ff = "Helvetica"; | 1030 | ff = "Helvetica"; |
1031 | fs = 10; | 1031 | fs = 10; |
1032 | } | 1032 | } |
1033 | 1033 | ||
1034 | setFont ( QFont ( ff, fs ), true ); | 1034 | setFont ( QFont ( ff, fs ), true ); |
1035 | 1035 | ||
1036 | // revert to global blocking policy ... | 1036 | // revert to global blocking policy ... |
1037 | Opie::force_appearance = config. readBoolEntry ( "ForceStyle", false ) ? Opie::Force_All : Opie::Force_None; | 1037 | Opie::force_appearance = config. readBoolEntry ( "ForceStyle", false ) ? Opie::Force_All : Opie::Force_None; |
1038 | Opie::force_appearance &= ~nostyle; | 1038 | Opie::force_appearance &= ~nostyle; |
1039 | } | 1039 | } |
1040 | 1040 | ||
1041 | void QPEApplication::systemMessage( const QCString& msg, const QByteArray& data ) | 1041 | void QPEApplication::systemMessage( const QCString& msg, const QByteArray& data ) |
1042 | { | 1042 | { |