-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 | |||
@@ -898,97 +898,97 @@ QString QPEApplication::qpeDir() | |||
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" ); |