author | ulf69 <ulf69> | 2004-08-11 01:56:15 (UTC) |
---|---|---|
committer | ulf69 <ulf69> | 2004-08-11 01:56:15 (UTC) |
commit | 42860986468bb90c55783fcebc1b20bd3ee460ac (patch) (unidiff) | |
tree | 35b2c491ae4fb98b018f72af29ee12ae67b5e053 /microkde/kglobal.cpp | |
parent | 1f7c51ec14521aedd2e8838f1760cdd5eb3ed08a (diff) | |
download | kdepimpi-42860986468bb90c55783fcebc1b20bd3ee460ac.zip kdepimpi-42860986468bb90c55783fcebc1b20bd3ee460ac.tar.gz kdepimpi-42860986468bb90c55783fcebc1b20bd3ee460ac.tar.bz2 |
changed the Desktopsize to meaningfull values
-rw-r--r-- | microkde/kglobal.cpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/microkde/kglobal.cpp b/microkde/kglobal.cpp index 2b1bd34..bf7e238 100644 --- a/microkde/kglobal.cpp +++ b/microkde/kglobal.cpp | |||
@@ -9,42 +9,44 @@ KIconLoader *KGlobal::mIconLoader = 0; | |||
9 | KStandardDirs *KGlobal::mDirs = 0; | 9 | KStandardDirs *KGlobal::mDirs = 0; |
10 | 10 | ||
11 | QString KGlobal::mAppName = "godot"; | 11 | QString KGlobal::mAppName = "godot"; |
12 | 12 | ||
13 | KLocale *KGlobal::locale() | 13 | KLocale *KGlobal::locale() |
14 | { | 14 | { |
15 | if ( !mLocale ) { | 15 | if ( !mLocale ) { |
16 | ASSERT(mAppName); | 16 | ASSERT(mAppName); |
17 | 17 | ||
18 | mLocale = new KLocale();//mAppName); | 18 | mLocale = new KLocale();//mAppName); |
19 | } | 19 | } |
20 | 20 | ||
21 | return mLocale; | 21 | return mLocale; |
22 | } | 22 | } |
23 | 23 | ||
24 | //US | 24 | //US |
25 | void KGlobal::setLocale(KLocale *kg) | 25 | void KGlobal::setLocale(KLocale *kg) |
26 | { | 26 | { |
27 | mLocale = kg; | 27 | mLocale = kg; |
28 | } | 28 | } |
29 | 29 | ||
30 | KConfig *KGlobal::config() | 30 | KConfig *KGlobal::config() |
31 | { | 31 | { |
32 | //mConfig is set inside setAppName. Though it has to be the first function you call. | 32 | //mConfig is set inside setAppName. Though it has to be the first function you call. |
33 | return mConfig; | 33 | return mConfig; |
34 | } | 34 | } |
35 | 35 | ||
36 | KGlobal::Size KGlobal::getDesktopSize() | 36 | KGlobal::Size KGlobal::getDesktopSize() |
37 | { | 37 | { |
38 | #ifdef DESKTOP_VERSION | 38 | #ifdef DESKTOP_VERSION |
39 | return KGlobal::Desktop; | 39 | return KGlobal::Desktop; |
40 | #else | 40 | #else |
41 | if ( QApplication::desktop()->width() < 480 ) | 41 | if ( QApplication::desktop()->width() <= 320 ) |
42 | return KGlobal::Small; | 42 | return KGlobal::Small; |
43 | else if ( QApplication::desktop()->width() > 480) | ||
44 | return KGlobal::Desktop; | ||
43 | else | 45 | else |
44 | return KGlobal::Medium; | 46 | return KGlobal::Medium; |
45 | #endif | 47 | #endif |
46 | } | 48 | } |
47 | 49 | ||
48 | KGlobal::Orientation KGlobal::getOrientation() | 50 | KGlobal::Orientation KGlobal::getOrientation() |
49 | { | 51 | { |
50 | if (QApplication::desktop()->width() > QApplication::desktop()->height()) | 52 | if (QApplication::desktop()->width() > QApplication::desktop()->height()) |
@@ -64,43 +66,43 @@ int KGlobal::getDesktopHeight() | |||
64 | } | 66 | } |
65 | 67 | ||
66 | 68 | ||
67 | KIconLoader *KGlobal::iconLoader() | 69 | KIconLoader *KGlobal::iconLoader() |
68 | { | 70 | { |
69 | if ( !mIconLoader ) { | 71 | if ( !mIconLoader ) { |
70 | mIconLoader = new KIconLoader(); | 72 | mIconLoader = new KIconLoader(); |
71 | } | 73 | } |
72 | 74 | ||
73 | return mIconLoader; | 75 | return mIconLoader; |
74 | } | 76 | } |
75 | 77 | ||
76 | KStandardDirs *KGlobal::dirs() | 78 | KStandardDirs *KGlobal::dirs() |
77 | { | 79 | { |
78 | if ( !mDirs ) { | 80 | if ( !mDirs ) { |
79 | mDirs = new KStandardDirs(); | 81 | mDirs = new KStandardDirs(); |
80 | } | 82 | } |
81 | 83 | ||
82 | return mDirs; | 84 | return mDirs; |
83 | } | 85 | } |
84 | 86 | ||
85 | void KGlobal::setAppName( const QString &appName ) | 87 | void KGlobal::setAppName( const QString &appName ) |
86 | { | 88 | { |
87 | mAppName = appName; | 89 | mAppName = appName; |
88 | 90 | ||
89 | mConfig = new KConfig( locateLocal("config", mAppName + "rc" ) ); | 91 | mConfig = new KConfig( locateLocal("config", mAppName + "rc" ) ); |
90 | } | 92 | } |
91 | 93 | ||
92 | //US | 94 | //US |
93 | QString KGlobal::getAppName() | 95 | QString KGlobal::getAppName() |
94 | { | 96 | { |
95 | return mAppName; | 97 | return mAppName; |
96 | } | 98 | } |
97 | QString KGlobal::formatMessage ( QString mess, int maxlen ) | 99 | QString KGlobal::formatMessage ( QString mess, int maxlen ) |
98 | { | 100 | { |
99 | //int maxlen = 80; | 101 | //int maxlen = 80; |
100 | int start = 0; | 102 | int start = 0; |
101 | int end = mess.length(); | 103 | int end = mess.length(); |
102 | QString retVal = ""; | 104 | QString retVal = ""; |
103 | int nl, space; | 105 | int nl, space; |
104 | while ( (end - start) > maxlen ) { | 106 | while ( (end - start) > maxlen ) { |
105 | nl = mess.find( "\n", start ); | 107 | nl = mess.find( "\n", start ); |
106 | if ( nl > 0 && nl < start + maxlen ) { | 108 | if ( nl > 0 && nl < start + maxlen ) { |