author | zautrix <zautrix> | 2005-03-30 11:55:53 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-03-30 11:55:53 (UTC) |
commit | b5222dd7a607f78235b1ea39fea0f95a9c08ccd3 (patch) (unidiff) | |
tree | 4e4d334ae9d8805b7718c1610bd84af128fd8151 | |
parent | 597cad3a63e6c22855704bf8435db70e3c2b184f (diff) | |
download | kdepimpi-b5222dd7a607f78235b1ea39fea0f95a9c08ccd3.zip kdepimpi-b5222dd7a607f78235b1ea39fea0f95a9c08ccd3.tar.gz kdepimpi-b5222dd7a607f78235b1ea39fea0f95a9c08ccd3.tar.bz2 |
fixes
-rw-r--r-- | kabc/addresseeview.cpp | 2 | ||||
-rw-r--r-- | kabc/plugins/file/resourcefile.cpp | 41 | ||||
-rw-r--r-- | kabc/plugins/file/resourcefile.h | 2 | ||||
-rw-r--r-- | microkde/kdatetbl.cpp | 2 | ||||
-rw-r--r-- | microkde/kdecore/kstandarddirs.cpp | 4 | ||||
-rw-r--r-- | microkde/kdecore/kstandarddirs.h | 4 |
6 files changed, 39 insertions, 16 deletions
diff --git a/kabc/addresseeview.cpp b/kabc/addresseeview.cpp index aa96210..9118c3d 100644 --- a/kabc/addresseeview.cpp +++ b/kabc/addresseeview.cpp | |||
@@ -1,539 +1,539 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of libkdepim. | 2 | This file is part of libkdepim. |
3 | 3 | ||
4 | Copyright (c) 2003 Tobias Koenig <tokoe@kde.org> | 4 | Copyright (c) 2003 Tobias Koenig <tokoe@kde.org> |
5 | 5 | ||
6 | This library is free software; you can redistribute it and/or | 6 | This library is free software; you can redistribute it and/or |
7 | modify it under the terms of the GNU Library General Public | 7 | modify it under the terms of the GNU Library General Public |
8 | License as published by the Free Software Foundation; either | 8 | License as published by the Free Software Foundation; either |
9 | version 2 of the License, or (at your option) any later version. | 9 | version 2 of the License, or (at your option) any later version. |
10 | 10 | ||
11 | This library is distributed in the hope that it will be useful, | 11 | This library is distributed in the hope that it will be useful, |
12 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 12 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
13 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 13 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
14 | Library General Public License for more details. | 14 | Library General Public License for more details. |
15 | 15 | ||
16 | You should have received a copy of the GNU Library General Public License | 16 | You should have received a copy of the GNU Library General Public License |
17 | along with this library; see the file COPYING.LIB. If not, write to | 17 | along with this library; see the file COPYING.LIB. If not, write to |
18 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 18 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
19 | Boston, MA 02111-1307, USA. | 19 | Boston, MA 02111-1307, USA. |
20 | */ | 20 | */ |
21 | 21 | ||
22 | #include <kabc/address.h> | 22 | #include <kabc/address.h> |
23 | #include <kabc/addressee.h> | 23 | #include <kabc/addressee.h> |
24 | #include <kabc/phonenumber.h> | 24 | #include <kabc/phonenumber.h> |
25 | #include <kglobal.h> | 25 | #include <kglobal.h> |
26 | //US#include <kglobalsettings.h> | 26 | //US#include <kglobalsettings.h> |
27 | #include <kiconloader.h> | 27 | #include <kiconloader.h> |
28 | #include <klocale.h> | 28 | #include <klocale.h> |
29 | //US #include <kstringhandler.h> | 29 | //US #include <kstringhandler.h> |
30 | #include <qscrollview.h> | 30 | #include <qscrollview.h> |
31 | #include <qregexp.h> | 31 | #include <qregexp.h> |
32 | #include <qfile.h> | 32 | #include <qfile.h> |
33 | #include <qvbox.h> | 33 | #include <qvbox.h> |
34 | #include <qlabel.h> | 34 | #include <qlabel.h> |
35 | #include <qwidget.h> | 35 | #include <qwidget.h> |
36 | #include <qlayout.h> | 36 | #include <qlayout.h> |
37 | #include <qapplication.h> | 37 | #include <qapplication.h> |
38 | #include <qpushbutton.h> | 38 | #include <qpushbutton.h> |
39 | #ifdef DESKTOP_VERSION | 39 | #ifdef DESKTOP_VERSION |
40 | #include <qpaintdevicemetrics.h> | 40 | #include <qpaintdevicemetrics.h> |
41 | #include <qprinter.h> | 41 | #include <qprinter.h> |
42 | #include <qpainter.h> | 42 | #include <qpainter.h> |
43 | #endif | 43 | #endif |
44 | 44 | ||
45 | 45 | ||
46 | #include "externalapphandler.h" | 46 | #include "externalapphandler.h" |
47 | #include <kabc/addresseeview.h> | 47 | #include <kabc/addresseeview.h> |
48 | 48 | ||
49 | 49 | ||
50 | //US #ifndef DESKTOP_VERSION | 50 | //US #ifndef DESKTOP_VERSION |
51 | //US #include <qtopia/qcopenvelope_qws.h> | 51 | //US #include <qtopia/qcopenvelope_qws.h> |
52 | //US #include <qpe/qpeapplication.h> | 52 | //US #include <qpe/qpeapplication.h> |
53 | //US #endif | 53 | //US #endif |
54 | 54 | ||
55 | //US static int kphoneInstalled = 0; | 55 | //US static int kphoneInstalled = 0; |
56 | 56 | ||
57 | using namespace KABC; | 57 | using namespace KABC; |
58 | 58 | ||
59 | AddresseeView::AddresseeView( QWidget *parent, const char *name ) | 59 | AddresseeView::AddresseeView( QWidget *parent, const char *name ) |
60 | : QTextBrowser( parent, name ) | 60 | : QTextBrowser( parent, name ) |
61 | 61 | ||
62 | 62 | ||
63 | { | 63 | { |
64 | //US setWrapPolicy( QTextEdit::AtWordBoundary ); | 64 | //US setWrapPolicy( QTextEdit::AtWordBoundary ); |
65 | setLinkUnderline( false ); | 65 | setLinkUnderline( false ); |
66 | // setVScrollBarMode( QScrollView::AlwaysOff ); | 66 | // setVScrollBarMode( QScrollView::AlwaysOff ); |
67 | //setHScrollBarMode( QScrollView::AlwaysOff ); | 67 | //setHScrollBarMode( QScrollView::AlwaysOff ); |
68 | 68 | ||
69 | //US QStyleSheet *sheet = styleSheet(); | 69 | //US QStyleSheet *sheet = styleSheet(); |
70 | //US QStyleSheetItem *link = sheet->item( "a" ); | 70 | //US QStyleSheetItem *link = sheet->item( "a" ); |
71 | //US link->setColor( KGlobalSettings::linkColor() ); | 71 | //US link->setColor( KGlobalSettings::linkColor() ); |
72 | 72 | ||
73 | } | 73 | } |
74 | void AddresseeView::printMe() | 74 | void AddresseeView::printMe() |
75 | { | 75 | { |
76 | #ifdef DESKTOP_VERSION | 76 | #ifdef DESKTOP_VERSION |
77 | QPrinter printer; | 77 | QPrinter printer; |
78 | if (!printer.setup() ) | 78 | if (!printer.setup() ) |
79 | return; | 79 | return; |
80 | QPainter p; | 80 | QPainter p; |
81 | p.begin ( &printer ); | 81 | p.begin ( &printer ); |
82 | QPaintDeviceMetrics m = QPaintDeviceMetrics ( &printer ); | 82 | QPaintDeviceMetrics m = QPaintDeviceMetrics ( &printer ); |
83 | float dx, dy; | 83 | float dx, dy; |
84 | int wid = (m.width() * 9)/10; | 84 | int wid = (m.width() * 9)/10; |
85 | dx = (float) wid/(float)contentsWidth (); | 85 | dx = (float) wid/(float)contentsWidth (); |
86 | dy = (float)(m.height()) / (float)contentsHeight (); | 86 | dy = (float)(m.height()) / (float)contentsHeight (); |
87 | float scale; | 87 | float scale; |
88 | // scale to fit the width or height of the paper | 88 | // scale to fit the width or height of the paper |
89 | if ( dx < dy ) | 89 | if ( dx < dy ) |
90 | scale = dx; | 90 | scale = dx; |
91 | else | 91 | else |
92 | scale = dy; | 92 | scale = dy; |
93 | p.translate( m.width()/10,0 ); | 93 | p.translate( m.width()/10,0 ); |
94 | p.scale( scale, scale ); | 94 | p.scale( scale, scale ); |
95 | drawContents ( &p, 0,0, contentsWidth (), contentsHeight () ); | 95 | drawContents ( &p, 0,0, contentsWidth (), contentsHeight () ); |
96 | p.end(); | 96 | p.end(); |
97 | #endif | 97 | #endif |
98 | } | 98 | } |
99 | void AddresseeView::setSource(const QString& n) | 99 | void AddresseeView::setSource(const QString& n) |
100 | { | 100 | { |
101 | //qDebug("********AddresseeView::setSource %s", n.latin1()); | 101 | //qDebug("********AddresseeView::setSource %s", n.latin1()); |
102 | 102 | ||
103 | if ( n.left( 6 ) == "mailto" ) | 103 | if ( n.left( 6 ) == "mailto" ) |
104 | ExternalAppHandler::instance()->mailToOneContact( n.mid(7) ); | 104 | ExternalAppHandler::instance()->mailToOneContact( n.mid(7) ); |
105 | else if ( n.left( 7 ) == "phoneto" ) | 105 | else if ( n.left( 7 ) == "phoneto" ) |
106 | ExternalAppHandler::instance()->callByPhone( n.mid(8) ); | 106 | ExternalAppHandler::instance()->callByPhone( n.mid(8) ); |
107 | else if ( n.left( 5 ) == "faxto" ) | 107 | else if ( n.left( 5 ) == "faxto" ) |
108 | ExternalAppHandler::instance()->callByFax( n.mid(6) ); | 108 | ExternalAppHandler::instance()->callByFax( n.mid(6) ); |
109 | else if ( n.left( 5 ) == "smsto" ) | 109 | else if ( n.left( 5 ) == "smsto" ) |
110 | ExternalAppHandler::instance()->callBySMS( n.mid(6) ); | 110 | ExternalAppHandler::instance()->callBySMS( n.mid(6) ); |
111 | else if ( n.left( 7 ) == "pagerto" ) | 111 | else if ( n.left( 7 ) == "pagerto" ) |
112 | ExternalAppHandler::instance()->callByPager( n.mid(8) ); | 112 | ExternalAppHandler::instance()->callByPager( n.mid(8) ); |
113 | else if ( n.left( 5 ) == "sipto" ) | 113 | else if ( n.left( 5 ) == "sipto" ) |
114 | ExternalAppHandler::instance()->callBySIP( n.mid(6) ); | 114 | ExternalAppHandler::instance()->callBySIP( n.mid(6) ); |
115 | 115 | ||
116 | } | 116 | } |
117 | void AddresseeView::setAddressee( const KABC::Addressee& mAddressee ) | 117 | void AddresseeView::setAddressee( const KABC::Addressee& mAddressee ) |
118 | { | 118 | { |
119 | bool kemailAvail = ExternalAppHandler::instance()->isEmailAppAvailable(); | 119 | bool kemailAvail = ExternalAppHandler::instance()->isEmailAppAvailable(); |
120 | // mAddressee = addr; | 120 | // mAddressee = addr; |
121 | // clear view | 121 | // clear view |
122 | //setText( QString::null ); | 122 | //setText( QString::null ); |
123 | 123 | ||
124 | if ( mAddressee.isEmpty() ) { | 124 | if ( mAddressee.isEmpty() ) { |
125 | setText( QString::null); | 125 | setText( QString::null); |
126 | return; | 126 | return; |
127 | } | 127 | } |
128 | QString name = ( mAddressee.assembledName().isEmpty() ? | 128 | QString name = ( mAddressee.assembledName().isEmpty() ? |
129 | mAddressee.formattedName() : mAddressee.assembledName() ); | 129 | mAddressee.formattedName() : mAddressee.assembledName() ); |
130 | 130 | ||
131 | QString dynamicPart; | 131 | QString dynamicPart; |
132 | 132 | ||
133 | dynamicPart += getPhoneNumbers( mAddressee.phoneNumbers(),true ); | 133 | dynamicPart += getPhoneNumbers( mAddressee.phoneNumbers(),true ); |
134 | QStringList emails = mAddressee.emails(); | 134 | QStringList emails = mAddressee.emails(); |
135 | QStringList::ConstIterator emailIt; | 135 | QStringList::ConstIterator emailIt; |
136 | QString type = i18n( "Email" ); | 136 | QString type = i18n( "Email" ); |
137 | emailIt = emails.begin(); | 137 | emailIt = emails.begin(); |
138 | if ( emailIt != emails.end() ) { | 138 | if ( emailIt != emails.end() ) { |
139 | if ( kemailAvail ) { | 139 | if ( kemailAvail ) { |
140 | dynamicPart += QString( | 140 | dynamicPart += QString( |
141 | "<tr><td align=\"right\"><b>%1</b></td>" | 141 | "<tr><td align=\"right\"><b>%1</b></td>" |
142 | "<td align=\"left\"><a href=\"mailto:%2 <%3> \">%4</a></td></tr>" ) | 142 | "<td align=\"left\"><a href=\"mailto:%2 <%3> \">%4</a></td></tr>" ) |
143 | .arg( type ) | 143 | .arg( type ) |
144 | .arg( name ) | 144 | .arg( name ) |
145 | .arg( *emailIt ) | 145 | .arg( *emailIt ) |
146 | .arg( *emailIt ); | 146 | .arg( *emailIt ); |
147 | ++emailIt; | 147 | ++emailIt; |
148 | } else { | 148 | } else { |
149 | dynamicPart += QString( | 149 | dynamicPart += QString( |
150 | "<tr><td align=\"right\"><b>%1</b></td>" | 150 | "<tr><td align=\"right\"><b>%1</b></td>" |
151 | "<td align=\"left\">%2</td></tr>" ) | 151 | "<td align=\"left\">%2</td></tr>" ) |
152 | .arg( type ) | 152 | .arg( type ) |
153 | .arg( *emailIt ); | 153 | .arg( *emailIt ); |
154 | ++emailIt; | 154 | ++emailIt; |
155 | } | 155 | } |
156 | } | 156 | } |
157 | if ( mAddressee.birthday().date().isValid() ) { | 157 | if ( mAddressee.birthday().date().isValid() ) { |
158 | dynamicPart += QString( | 158 | dynamicPart += QString( |
159 | "<tr><td align=\"right\"><b>%1</b></td>" | 159 | "<tr><td align=\"right\"><b>%1</b></td>" |
160 | "<td align=\"left\">%2</td></tr>" ) | 160 | "<td align=\"left\">%2</td></tr>" ) |
161 | .arg( i18n ("Birthday") ) | 161 | .arg( i18n ("Birthday") ) |
162 | .arg( KGlobal::locale()->formatDate( mAddressee.birthday().date() ,true) ); | 162 | .arg( KGlobal::locale()->formatDate( mAddressee.birthday().date() ,true) ); |
163 | } | 163 | } |
164 | dynamicPart += getPhoneNumbers( mAddressee.phoneNumbers(), false ); | 164 | dynamicPart += getPhoneNumbers( mAddressee.phoneNumbers(), false ); |
165 | 165 | ||
166 | for ( ; emailIt != emails.end(); ++emailIt ) { | 166 | for ( ; emailIt != emails.end(); ++emailIt ) { |
167 | if ( kemailAvail ) { | 167 | if ( kemailAvail ) { |
168 | dynamicPart += QString( | 168 | dynamicPart += QString( |
169 | "<tr><td align=\"right\"><b>%1</b></td>" | 169 | "<tr><td align=\"right\"><b>%1</b></td>" |
170 | "<td align=\"left\"><a href=\"mailto:%2 <%3> \">%4</a></td></tr>" ) | 170 | "<td align=\"left\"><a href=\"mailto:%2 <%3> \">%4</a></td></tr>" ) |
171 | .arg( type ) | 171 | .arg( type ) |
172 | .arg( name ) | 172 | .arg( name ) |
173 | .arg( *emailIt ) | 173 | .arg( *emailIt ) |
174 | .arg( *emailIt ); | 174 | .arg( *emailIt ); |
175 | } else { | 175 | } else { |
176 | dynamicPart += QString( | 176 | dynamicPart += QString( |
177 | "<tr><td align=\"right\"><b>%1</b></td>" | 177 | "<tr><td align=\"right\"><b>%1</b></td>" |
178 | "<td align=\"left\">%2</td></tr>" ) | 178 | "<td align=\"left\">%2</td></tr>" ) |
179 | .arg( type ) | 179 | .arg( type ) |
180 | .arg( *emailIt ); | 180 | .arg( *emailIt ); |
181 | } | 181 | } |
182 | } | 182 | } |
183 | 183 | ||
184 | if ( !mAddressee.url().url().isEmpty() ) { | 184 | if ( !mAddressee.url().url().isEmpty() ) { |
185 | dynamicPart += QString( | 185 | dynamicPart += QString( |
186 | "<tr><td align=\"right\"><b>%1</b></td>" | 186 | "<tr><td align=\"right\"><b>%1</b></td>" |
187 | "<td align=\"left\">%2</td></tr>" ) | 187 | "<td align=\"left\">%2</td></tr>" ) |
188 | .arg( i18n( "Homepage" ) ) | 188 | .arg( i18n( "Homepage" ) ) |
189 | //US .arg( KStringHandler::tagURLs( mAddressee.url().url() ) ); | 189 | //US .arg( KStringHandler::tagURLs( mAddressee.url().url() ) ); |
190 | .arg( mAddressee.url().url() ); | 190 | .arg( mAddressee.url().url() ); |
191 | //qDebug("AddresseeView::setAddressee has to be verified."); | 191 | //qDebug("AddresseeView::setAddressee has to be verified."); |
192 | } | 192 | } |
193 | 193 | ||
194 | KABC::Address::List addresses = mAddressee.addresses(); | 194 | KABC::Address::List addresses = mAddressee.addresses(); |
195 | KABC::Address::List::ConstIterator addrIt; | 195 | KABC::Address::List::ConstIterator addrIt; |
196 | for ( addrIt = addresses.begin(); addrIt != addresses.end(); ++addrIt ) { | 196 | for ( addrIt = addresses.begin(); addrIt != addresses.end(); ++addrIt ) { |
197 | if ( true /*(*addrIt).label().isEmpty()*/ ) { | 197 | if ( true /*(*addrIt).label().isEmpty()*/ ) { |
198 | QString formattedAddress = (*addrIt).formattedAddress().stripWhiteSpace(); | 198 | QString formattedAddress = (*addrIt).formattedAddress().stripWhiteSpace(); |
199 | //US formattedAddress = formattedAddress.replace( '\n', "<br>" ); | 199 | //US formattedAddress = formattedAddress.replace( '\n', "<br>" ); |
200 | //qDebug("adresss %s ",formattedAddress.latin1() ); | 200 | //qDebug("adresss %s ",formattedAddress.latin1() ); |
201 | formattedAddress = formattedAddress.replace( QRegExp("\n"), "<br>" ); | 201 | formattedAddress = formattedAddress.replace( QRegExp("\n"), "<br>" ); |
202 | //qDebug("AddresseeView::setAddressee has to be verified."); | 202 | //qDebug("AddresseeView::setAddressee has to be verified."); |
203 | 203 | ||
204 | dynamicPart += QString( | 204 | dynamicPart += QString( |
205 | "<tr><td align=\"right\"><b>%1</b></td>" | 205 | "<tr><td align=\"right\"><b>%1</b></td>" |
206 | "<td align=\"left\">%2</td></tr>" ) | 206 | "<td align=\"left\">%2</td></tr>" ) |
207 | .arg( KABC::Address::typeLabel( (*addrIt).type() ) ) | 207 | .arg( KABC::Address::typeLabel( (*addrIt).type() ) ) |
208 | .arg( formattedAddress ); | 208 | .arg( formattedAddress ); |
209 | } else { | 209 | } else { |
210 | 210 | ||
211 | dynamicPart += QString( | 211 | dynamicPart += QString( |
212 | "<tr><td align=\"right\"><b>%1</b></td>" | 212 | "<tr><td align=\"right\"><b>%1</b></td>" |
213 | "<td align=\"left\">%2</td></tr>" ) | 213 | "<td align=\"left\">%2</td></tr>" ) |
214 | .arg( KABC::Address::typeLabel( (*addrIt).type() ) ) | 214 | .arg( KABC::Address::typeLabel( (*addrIt).type() ) ) |
215 | //US .arg( (*addrIt).label().replace( '\n', "<br>" ) ); | 215 | //US .arg( (*addrIt).label().replace( '\n', "<br>" ) ); |
216 | .arg( (*addrIt).label() /*replace( QRegExp("\n"), "<br>" )*/ ); | 216 | .arg( (*addrIt).label() /*replace( QRegExp("\n"), "<br>" )*/ ); |
217 | 217 | ||
218 | } | 218 | } |
219 | } | 219 | } |
220 | 220 | ||
221 | QString notes; | 221 | QString notes; |
222 | if ( !mAddressee.note().isEmpty() ) { | 222 | if ( !mAddressee.note().isEmpty() ) { |
223 | notes = QString( | 223 | notes = QString( |
224 | "<tr>" | 224 | "<tr>" |
225 | "<td align=\"right\" valign=\"top\"><b>%1</b></td>" // note label | 225 | "<td align=\"right\" valign=\"top\"><b>%1</b></td>" // note label |
226 | "<td align=\"left\">%2</td>" // note | 226 | "<td align=\"left\">%2</td>" // note |
227 | "</tr>" ).arg( i18n( "Notes" ) ) | 227 | "</tr>" ).arg( i18n( "Notes" ) ) |
228 | //US .arg( mAddressee.note().replace( '\n', "<br>" ) ); | 228 | //US .arg( mAddressee.note().replace( '\n', "<br>" ) ); |
229 | .arg( mAddressee.note().replace( QRegExp("\n"), "<br>" ) ); | 229 | .arg( mAddressee.note().replace( QRegExp("\n"), "<br>" ) ); |
230 | //qDebug("AddresseeView::setAddressee has to be verified."); | 230 | //qDebug("AddresseeView::setAddressee has to be verified."); |
231 | } | 231 | } |
232 | 232 | ||
233 | QString aRole = ""; | 233 | QString aRole = ""; |
234 | QString aOrga = ""; | 234 | QString aOrga = ""; |
235 | if ( true /*!mAddressee.role().isEmpty()*/ ) { | 235 | if ( true /*!mAddressee.role().isEmpty()*/ ) { |
236 | aRole = "<tr>" | 236 | aRole = "<tr>" |
237 | "<td align=\"left\">" + mAddressee.role() + "</td>" | 237 | "<td align=\"left\">" + mAddressee.role() + "</td>" |
238 | "</tr>"; | 238 | "</tr>"; |
239 | } | 239 | } |
240 | if ( true /*!mAddressee.organization().isEmpty()*/ ) { | 240 | if ( true /*!mAddressee.organization().isEmpty()*/ ) { |
241 | aOrga = "<tr>" | 241 | aOrga = "<tr>" |
242 | "<td align=\"left\">" + mAddressee.organization() + "</td>" | 242 | "<td align=\"left\">" + mAddressee.organization() + "</td>" |
243 | "</tr>"; | 243 | "</tr>"; |
244 | } | 244 | } |
245 | mText = ""; | 245 | mText = ""; |
246 | QString picString = ""; | 246 | QString picString = ""; |
247 | KABC::Picture picture = mAddressee.photo(); | 247 | KABC::Picture picture = mAddressee.photo(); |
248 | bool picAvailintern = false; | 248 | bool picAvailintern = false; |
249 | bool picAvailUrl = false; | 249 | bool picAvailUrl = false; |
250 | if (! picture.undefined() ) { | 250 | if (! picture.undefined() ) { |
251 | picAvailintern = (picture.isIntern() && !picture.data().isNull()); | 251 | picAvailintern = (picture.isIntern() && !picture.data().isNull()); |
252 | picAvailUrl = !picture.isIntern() && QFile::exists(picture.url() ); | 252 | picAvailUrl = !picture.isIntern() && QFile::exists(picture.url() ); |
253 | } | 253 | } |
254 | if ( picAvailUrl || picAvailintern || QApplication::desktop()->width() > 320 ) { | 254 | if ( picAvailUrl || picAvailintern || QApplication::desktop()->width() > 320 ) { |
255 | picString = "<img src=\"myimage\" width=\"50\" height=\"70\">"; | 255 | picString = "<img src=\"myimage\" width=\"50\" height=\"70\">"; |
256 | if ( picAvailintern ) { | 256 | if ( picAvailintern ) { |
257 | QMimeSourceFactory::defaultFactory()->setImage( "myimage", picture.data() ); | 257 | QMimeSourceFactory::defaultFactory()->setImage( "myimage", picture.data() ); |
258 | } else { | 258 | } else { |
259 | if ( picAvailUrl ) { | 259 | if ( picAvailUrl ) { |
260 | QMimeSourceFactory::defaultFactory()->setPixmap( "myimage", QPixmap( picture.url() )); | 260 | QMimeSourceFactory::defaultFactory()->setPixmap( "myimage", QPixmap( picture.url() )); |
261 | } else { | 261 | } else { |
262 | if ( !mAddressee.custom( "KADDRESSBOOK", "X-Children" ).isEmpty() ) { | 262 | if ( !mAddressee.custom( "KADDRESSBOOK", "X-Children" ).isEmpty() ) { |
263 | static bool setDefaultImageChildren = false; | 263 | static bool setDefaultImageChildren = false; |
264 | if ( !setDefaultImageChildren ) { | 264 | if ( !setDefaultImageChildren ) { |
265 | QMimeSourceFactory::defaultFactory()->setPixmap( "familyIcon", KGlobal::iconLoader()->loadIcon( "ic_kids", KIcon::Desktop, 128 ) ); | 265 | QMimeSourceFactory::defaultFactory()->setPixmap( "familyIcon", KGlobal::iconLoader()->loadIcon( "ic_kids", KIcon::Desktop, 128 ) ); |
266 | setDefaultImageChildren = true; | 266 | setDefaultImageChildren = true; |
267 | } | 267 | } |
268 | picString = "<img src=\"familyIcon\" width=\"64\" height=\"64\">"; | 268 | picString = "<img src=\"familyIcon\" width=\"64\" height=\"64\">"; |
269 | 269 | ||
270 | } else if ( !mAddressee.custom( "KADDRESSBOOK", "X-SpousesName" ).isEmpty() ) { | 270 | } else if ( !mAddressee.custom( "KADDRESSBOOK", "X-SpousesName" ).isEmpty() ) { |
271 | static bool setDefaultImagepouses = false; | 271 | static bool setDefaultImagepouses = false; |
272 | if ( !setDefaultImagepouses ) { | 272 | if ( !setDefaultImagepouses ) { |
273 | QMimeSourceFactory::defaultFactory()->setPixmap( "SpousesIcon", KGlobal::iconLoader()->loadIcon( "ic_family", KIcon::Desktop, 128 ) ); | 273 | QMimeSourceFactory::defaultFactory()->setPixmap( "SpousesIcon", KGlobal::iconLoader()->loadIcon( "ic_family", KIcon::Desktop, 128 ) ); |
274 | setDefaultImagepouses = true; | 274 | setDefaultImagepouses = true; |
275 | } | 275 | } |
276 | picString = "<img src=\"SpousesIcon\" width=\"64\" height=\"64\">"; | 276 | picString = "<img src=\"SpousesIcon\" width=\"64\" height=\"64\">"; |
277 | } else { | 277 | } else { |
278 | QString gen = mAddressee.custom( "KADDRESSBOOK", "X-Gender" ); | 278 | QString gen = mAddressee.custom( "KADDRESSBOOK", "X-Gender" ); |
279 | if ( gen == "male" ) { | 279 | if ( gen == "male" ) { |
280 | static bool setDefaultImageMale = false; | 280 | static bool setDefaultImageMale = false; |
281 | if ( !setDefaultImageMale ) { | 281 | if ( !setDefaultImageMale ) { |
282 | QMimeSourceFactory::defaultFactory()->setPixmap( "MaleIcon", KGlobal::iconLoader()->loadIcon( "ic_male", KIcon::Desktop, 128 ) ); | 282 | QMimeSourceFactory::defaultFactory()->setPixmap( "MaleIcon", KGlobal::iconLoader()->loadIcon( "ic_male", KIcon::Desktop, 128 ) ); |
283 | setDefaultImageMale = true; | 283 | setDefaultImageMale = true; |
284 | } | 284 | } |
285 | picString = "<img src=\"MaleIcon\" width=\"64\" height=\"64\">"; | 285 | picString = "<img src=\"MaleIcon\" width=\"64\" height=\"64\">"; |
286 | 286 | ||
287 | } else if ( gen == "female" ) { | 287 | } else if ( gen == "female" ) { |
288 | static bool setDefaultImageFemale = false; | 288 | static bool setDefaultImageFemale = false; |
289 | if ( !setDefaultImageFemale ) { | 289 | if ( !setDefaultImageFemale ) { |
290 | QMimeSourceFactory::defaultFactory()->setPixmap( "FemaleIcon", KGlobal::iconLoader()->loadIcon( "ic_female", KIcon::Desktop, 128 ) ); | 290 | QMimeSourceFactory::defaultFactory()->setPixmap( "FemaleIcon", KGlobal::iconLoader()->loadIcon( "ic_female", KIcon::Desktop, 128 ) ); |
291 | setDefaultImageFemale = true; | 291 | setDefaultImageFemale = true; |
292 | } | 292 | } |
293 | picString = "<img src=\"FemaleIcon\" width=\"64\" height=\"64\">"; | 293 | picString = "<img src=\"FemaleIcon\" width=\"64\" height=\"64\">"; |
294 | 294 | ||
295 | } else { | 295 | } else { |
296 | static bool setDefaultImage = false; | 296 | static bool setDefaultImage = false; |
297 | if ( !setDefaultImage ) { | 297 | if ( !setDefaultImage ) { |
298 | qDebug("Setting default pixmap "); | 298 | //qDebug("Setting default pixmap "); |
299 | QMimeSourceFactory::defaultFactory()->setPixmap( "defaultIcon", KGlobal::iconLoader()->loadIcon( "ic_penguin", KIcon::Desktop, 128 ) ); | 299 | QMimeSourceFactory::defaultFactory()->setPixmap( "defaultIcon", KGlobal::iconLoader()->loadIcon( "ic_penguin", KIcon::Desktop, 128 ) ); |
300 | setDefaultImage = true; | 300 | setDefaultImage = true; |
301 | } | 301 | } |
302 | picString = "<img src=\"defaultIcon\" width=\"64\" height=\"64\">"; | 302 | picString = "<img src=\"defaultIcon\" width=\"64\" height=\"64\">"; |
303 | } | 303 | } |
304 | } | 304 | } |
305 | } | 305 | } |
306 | } | 306 | } |
307 | mText = QString::fromLatin1( | 307 | mText = QString::fromLatin1( |
308 | "<html>" | 308 | "<html>" |
309 | "<body text=\"%1\" bgcolor=\"%2\">" // text and background color | 309 | "<body text=\"%1\" bgcolor=\"%2\">" // text and background color |
310 | "<table>" | 310 | "<table>" |
311 | "<tr>" | 311 | "<tr>" |
312 | "<td rowspan=\"3\" align=\"right\" valign=\"top\">" | 312 | "<td rowspan=\"3\" align=\"right\" valign=\"top\">" |
313 | "%3" | 313 | "%3" |
314 | "</td>" | 314 | "</td>" |
315 | "<td align=\"left\"><font size=\"+2\"><b>%4</b></font></td>" // name | 315 | "<td align=\"left\"><font size=\"+2\"><b>%4</b></font></td>" // name |
316 | "</tr>" | 316 | "</tr>" |
317 | "%5" // role | 317 | "%5" // role |
318 | "%6" // organization | 318 | "%6" // organization |
319 | "<td colspan=\"2\"> </td>" | 319 | "<td colspan=\"2\"> </td>" |
320 | "%7" // dynamic part | 320 | "%7" // dynamic part |
321 | "%8" // notes | 321 | "%8" // notes |
322 | "</table>" | 322 | "</table>" |
323 | "</body>" | 323 | "</body>" |
324 | "</html>") | 324 | "</html>") |
325 | //US | 325 | //US |
326 | .arg( /*KGlobalSettings::textColor().name()*/ "black" ) | 326 | .arg( /*KGlobalSettings::textColor().name()*/ "black" ) |
327 | //US | 327 | //US |
328 | .arg( /*KGlobalSettings::baseColor().name()*/ "white" ) | 328 | .arg( /*KGlobalSettings::baseColor().name()*/ "white" ) |
329 | .arg( picString ) | 329 | .arg( picString ) |
330 | .arg( name ) | 330 | .arg( name ) |
331 | .arg( aRole ) | 331 | .arg( aRole ) |
332 | .arg( aOrga ) | 332 | .arg( aOrga ) |
333 | .arg( dynamicPart ) | 333 | .arg( dynamicPart ) |
334 | .arg( notes ); | 334 | .arg( notes ); |
335 | 335 | ||
336 | } else { // no picture! | 336 | } else { // no picture! |
337 | 337 | ||
338 | mText = "<table width=\"100%\">\n"; | 338 | mText = "<table width=\"100%\">\n"; |
339 | //mText += "<tr bgcolor=\"#3679AD\"><td><h2>"; | 339 | //mText += "<tr bgcolor=\"#3679AD\"><td><h2>"; |
340 | #ifdef DESKTOP_VERSION | 340 | #ifdef DESKTOP_VERSION |
341 | mText += "<tr bgcolor=\"#5699CD\"><td align=\"left\"><h1>"; | 341 | mText += "<tr bgcolor=\"#5699CD\"><td align=\"left\"><h1>"; |
342 | mText += "<font color=\"#FFFFFF\">" + name +"</font></h1>"; | 342 | mText += "<font color=\"#FFFFFF\">" + name +"</font></h1>"; |
343 | #else | 343 | #else |
344 | mText += "<tr bgcolor=\"#5699CD\"><td align=\"left\"><h3>"; | 344 | mText += "<tr bgcolor=\"#5699CD\"><td align=\"left\"><h3>"; |
345 | mText += "<font color=\"#FFFFFF\"> " + name +"</font></h3>"; | 345 | mText += "<font color=\"#FFFFFF\"> " + name +"</font></h3>"; |
346 | #endif | 346 | #endif |
347 | 347 | ||
348 | mText += "</td></tr>\n<tr bgcolor=\"#EAF8FA\"><td>"; | 348 | mText += "</td></tr>\n<tr bgcolor=\"#EAF8FA\"><td>"; |
349 | 349 | ||
350 | mText += "<table><td colspan=\"2\"> </td>"; | 350 | mText += "<table><td colspan=\"2\"> </td>"; |
351 | /* | 351 | /* |
352 | mText += QString("<tr><td align=\"right\"><b2>%1</b2></td>" | 352 | mText += QString("<tr><td align=\"right\"><b2>%1</b2></td>" |
353 | "<td align=\"left\"><b>%2</b></td></tr>" ) | 353 | "<td align=\"left\"><b>%2</b></td></tr>" ) |
354 | .arg( i18n(" ") ) | 354 | .arg( i18n(" ") ) |
355 | .arg( name ); | 355 | .arg( name ); |
356 | */ | 356 | */ |
357 | if ( ! mAddressee.role().isEmpty() ) | 357 | if ( ! mAddressee.role().isEmpty() ) |
358 | mText += QString("<tr><td align=\"right\"><b>%1</b></td>" | 358 | mText += QString("<tr><td align=\"right\"><b>%1</b></td>" |
359 | "<td align=\"left\">%2</td></tr>" ) | 359 | "<td align=\"left\">%2</td></tr>" ) |
360 | .arg( i18n(" ") ) | 360 | .arg( i18n(" ") ) |
361 | .arg( mAddressee.role()); | 361 | .arg( mAddressee.role()); |
362 | if ( ! mAddressee.organization().isEmpty() ) | 362 | if ( ! mAddressee.organization().isEmpty() ) |
363 | mText += QString("<tr><td align=\"right\"><b>%1</b></td>" | 363 | mText += QString("<tr><td align=\"right\"><b>%1</b></td>" |
364 | "<td align=\"left\">%2</td></tr>" ) | 364 | "<td align=\"left\">%2</td></tr>" ) |
365 | .arg( i18n(" ") ) | 365 | .arg( i18n(" ") ) |
366 | .arg( mAddressee.organization()); | 366 | .arg( mAddressee.organization()); |
367 | mText += dynamicPart; | 367 | mText += dynamicPart; |
368 | mText += notes; | 368 | mText += notes; |
369 | mText += "</table>"; | 369 | mText += "</table>"; |
370 | 370 | ||
371 | } | 371 | } |
372 | 372 | ||
373 | // at last display it... | 373 | // at last display it... |
374 | setText( mText ); | 374 | setText( mText ); |
375 | 375 | ||
376 | } | 376 | } |
377 | 377 | ||
378 | QString AddresseeView::getPhoneNumbers( KABC::PhoneNumber::List phones ,bool preferred ) | 378 | QString AddresseeView::getPhoneNumbers( KABC::PhoneNumber::List phones ,bool preferred ) |
379 | { | 379 | { |
380 | ExternalAppHandler* eah = ExternalAppHandler::instance(); | 380 | ExternalAppHandler* eah = ExternalAppHandler::instance(); |
381 | bool kphoneAvail = eah->isPhoneAppAvailable(); | 381 | bool kphoneAvail = eah->isPhoneAppAvailable(); |
382 | bool kfaxAvail = eah->isFaxAppAvailable(); | 382 | bool kfaxAvail = eah->isFaxAppAvailable(); |
383 | bool ksmsAvail = eah->isSMSAppAvailable(); | 383 | bool ksmsAvail = eah->isSMSAppAvailable(); |
384 | bool kpagerAvail = eah->isPagerAppAvailable(); | 384 | bool kpagerAvail = eah->isPagerAppAvailable(); |
385 | bool ksipAvail = eah->isSIPAppAvailable(); | 385 | bool ksipAvail = eah->isSIPAppAvailable(); |
386 | QString dynamicPart; | 386 | QString dynamicPart; |
387 | KABC::PhoneNumber::List::ConstIterator phoneIt; | 387 | KABC::PhoneNumber::List::ConstIterator phoneIt; |
388 | QString extension; | 388 | QString extension; |
389 | int phonetype; | 389 | int phonetype; |
390 | QString sms; | 390 | QString sms; |
391 | for ( phoneIt = phones.begin(); phoneIt != phones.end(); ++phoneIt ) { | 391 | for ( phoneIt = phones.begin(); phoneIt != phones.end(); ++phoneIt ) { |
392 | phonetype = (*phoneIt).type(); | 392 | phonetype = (*phoneIt).type(); |
393 | if ( ((phonetype & KABC::PhoneNumber::Pref) == 0 ) == preferred ) | 393 | if ( ((phonetype & KABC::PhoneNumber::Pref) == 0 ) == preferred ) |
394 | continue; | 394 | continue; |
395 | if (ksmsAvail && | 395 | if (ksmsAvail && |
396 | ( | 396 | ( |
397 | ((phonetype & KABC::PhoneNumber::Car) == KABC::PhoneNumber::Car) || | 397 | ((phonetype & KABC::PhoneNumber::Car) == KABC::PhoneNumber::Car) || |
398 | ((phonetype & KABC::PhoneNumber::Cell) == KABC::PhoneNumber::Cell) | 398 | ((phonetype & KABC::PhoneNumber::Cell) == KABC::PhoneNumber::Cell) |
399 | ) | 399 | ) |
400 | ) | 400 | ) |
401 | { | 401 | { |
402 | sms = QString("<a href=\"smsto:%1 \">(sms)</a>" ) | 402 | sms = QString("<a href=\"smsto:%1 \">(sms)</a>" ) |
403 | .arg( (*phoneIt).number() ); | 403 | .arg( (*phoneIt).number() ); |
404 | 404 | ||
405 | } | 405 | } |
406 | else | 406 | else |
407 | sms = ""; | 407 | sms = ""; |
408 | 408 | ||
409 | extension = QString::null; | 409 | extension = QString::null; |
410 | if ((phonetype & KABC::PhoneNumber::Fax) == KABC::PhoneNumber::Fax) { | 410 | if ((phonetype & KABC::PhoneNumber::Fax) == KABC::PhoneNumber::Fax) { |
411 | if (kfaxAvail) extension = "faxto:"; | 411 | if (kfaxAvail) extension = "faxto:"; |
412 | } | 412 | } |
413 | else if ((phonetype & KABC::PhoneNumber::Pager) == KABC::PhoneNumber::Pager) { | 413 | else if ((phonetype & KABC::PhoneNumber::Pager) == KABC::PhoneNumber::Pager) { |
414 | if (kpagerAvail) extension = "pagerto:"; | 414 | if (kpagerAvail) extension = "pagerto:"; |
415 | } | 415 | } |
416 | else if ((phonetype & KABC::PhoneNumber::Sip) == KABC::PhoneNumber::Sip) { | 416 | else if ((phonetype & KABC::PhoneNumber::Sip) == KABC::PhoneNumber::Sip) { |
417 | if (ksipAvail) extension = "sipto:"; | 417 | if (ksipAvail) extension = "sipto:"; |
418 | } | 418 | } |
419 | else if (kphoneAvail) { | 419 | else if (kphoneAvail) { |
420 | extension = "phoneto:"; | 420 | extension = "phoneto:"; |
421 | } | 421 | } |
422 | else | 422 | else |
423 | extension = QString::null; | 423 | extension = QString::null; |
424 | 424 | ||
425 | if ( !extension.isEmpty() ) { | 425 | if ( !extension.isEmpty() ) { |
426 | dynamicPart += QString( | 426 | dynamicPart += QString( |
427 | "<tr><td align=\"right\"><b>%1</b></td>" | 427 | "<tr><td align=\"right\"><b>%1</b></td>" |
428 | "<td align=\"left\"><a href=\"%2%3 \">%4</a> %5</td></tr>" ) | 428 | "<td align=\"left\"><a href=\"%2%3 \">%4</a> %5</td></tr>" ) |
429 | .arg( KABC::PhoneNumber::typeLabel( phonetype ) ) | 429 | .arg( KABC::PhoneNumber::typeLabel( phonetype ) ) |
430 | .arg( extension ) | 430 | .arg( extension ) |
431 | .arg( (*phoneIt).number() ) | 431 | .arg( (*phoneIt).number() ) |
432 | .arg( (*phoneIt).number() ) | 432 | .arg( (*phoneIt).number() ) |
433 | .arg( sms ); | 433 | .arg( sms ); |
434 | 434 | ||
435 | } else { | 435 | } else { |
436 | dynamicPart += QString( | 436 | dynamicPart += QString( |
437 | "<tr><td align=\"right\"><b>%1</b></td>" | 437 | "<tr><td align=\"right\"><b>%1</b></td>" |
438 | "<td align=\"left\">%2 %3</td></tr>" ) | 438 | "<td align=\"left\">%2 %3</td></tr>" ) |
439 | .arg( KABC::PhoneNumber::typeLabel( phonetype ) ) | 439 | .arg( KABC::PhoneNumber::typeLabel( phonetype ) ) |
440 | .arg( (*phoneIt).number() ) | 440 | .arg( (*phoneIt).number() ) |
441 | .arg( sms ); | 441 | .arg( sms ); |
442 | } | 442 | } |
443 | } | 443 | } |
444 | return dynamicPart; | 444 | return dynamicPart; |
445 | } | 445 | } |
446 | /* | 446 | /* |
447 | KABC::Addressee AddresseeView::addressee() const | 447 | KABC::Addressee AddresseeView::addressee() const |
448 | { | 448 | { |
449 | return mAddressee; | 449 | return mAddressee; |
450 | } | 450 | } |
451 | */ | 451 | */ |
452 | void AddresseeView::addTag(const QString & tag,const QString & text) | 452 | void AddresseeView::addTag(const QString & tag,const QString & text) |
453 | { | 453 | { |
454 | if ( text.isEmpty() ) | 454 | if ( text.isEmpty() ) |
455 | return; | 455 | return; |
456 | int number=text.contains("\n"); | 456 | int number=text.contains("\n"); |
457 | QString str = "<" + tag + ">"; | 457 | QString str = "<" + tag + ">"; |
458 | QString tmpText=text; | 458 | QString tmpText=text; |
459 | QString tmpStr=str; | 459 | QString tmpStr=str; |
460 | if(number !=-1) | 460 | if(number !=-1) |
461 | { | 461 | { |
462 | if (number > 0) { | 462 | if (number > 0) { |
463 | int pos=0; | 463 | int pos=0; |
464 | QString tmp; | 464 | QString tmp; |
465 | for(int i=0;i<=number;i++) { | 465 | for(int i=0;i<=number;i++) { |
466 | pos=tmpText.find("\n"); | 466 | pos=tmpText.find("\n"); |
467 | tmp=tmpText.left(pos); | 467 | tmp=tmpText.left(pos); |
468 | tmpText=tmpText.right(tmpText.length()-pos-1); | 468 | tmpText=tmpText.right(tmpText.length()-pos-1); |
469 | tmpStr+=tmp+"<br>"; | 469 | tmpStr+=tmp+"<br>"; |
470 | } | 470 | } |
471 | } | 471 | } |
472 | else tmpStr += tmpText; | 472 | else tmpStr += tmpText; |
473 | tmpStr+="</" + tag + ">"; | 473 | tmpStr+="</" + tag + ">"; |
474 | mText.append(tmpStr); | 474 | mText.append(tmpStr); |
475 | } | 475 | } |
476 | else | 476 | else |
477 | { | 477 | { |
478 | str += text + "</" + tag + ">"; | 478 | str += text + "</" + tag + ">"; |
479 | mText.append(str); | 479 | mText.append(str); |
480 | } | 480 | } |
481 | } | 481 | } |
482 | 482 | ||
483 | AddresseeChooser::AddresseeChooser( KABC::Addressee loc, KABC::Addressee rem, bool takeloc, QWidget *parent, const char *name ) : KDialogBase(parent,name, | 483 | AddresseeChooser::AddresseeChooser( KABC::Addressee loc, KABC::Addressee rem, bool takeloc, QWidget *parent, const char *name ) : KDialogBase(parent,name, |
484 | true ,i18n("Conflict! Please choose Adressee!"),Ok|User1|Close,Close, false) | 484 | true ,i18n("Conflict! Please choose Adressee!"),Ok|User1|Close,Close, false) |
485 | { | 485 | { |
486 | findButton( Close )->setText( i18n("Cancel Sync")); | 486 | findButton( Close )->setText( i18n("Cancel Sync")); |
487 | findButton( Ok )->setText( i18n("Remote")); | 487 | findButton( Ok )->setText( i18n("Remote")); |
488 | findButton( User1 )->setText( i18n("Local")); | 488 | findButton( User1 )->setText( i18n("Local")); |
489 | QWidget* topframe = new QWidget( this ); | 489 | QWidget* topframe = new QWidget( this ); |
490 | setMainWidget( topframe ); | 490 | setMainWidget( topframe ); |
491 | QBoxLayout* bl; | 491 | QBoxLayout* bl; |
492 | if ( QApplication::desktop()->width() < 640 ) { | 492 | if ( QApplication::desktop()->width() < 640 ) { |
493 | bl = new QVBoxLayout( topframe ); | 493 | bl = new QVBoxLayout( topframe ); |
494 | } else { | 494 | } else { |
495 | bl = new QHBoxLayout( topframe ); | 495 | bl = new QHBoxLayout( topframe ); |
496 | } | 496 | } |
497 | QVBox* subframe = new QVBox( topframe ); | 497 | QVBox* subframe = new QVBox( topframe ); |
498 | bl->addWidget(subframe ); | 498 | bl->addWidget(subframe ); |
499 | QLabel* lab = new QLabel( i18n("Local Addressee"), subframe ); | 499 | QLabel* lab = new QLabel( i18n("Local Addressee"), subframe ); |
500 | if ( takeloc ) | 500 | if ( takeloc ) |
501 | lab->setBackgroundColor(Qt::green.light() ); | 501 | lab->setBackgroundColor(Qt::green.light() ); |
502 | AddresseeView * av = new AddresseeView( subframe ); | 502 | AddresseeView * av = new AddresseeView( subframe ); |
503 | av->setAddressee( loc ); | 503 | av->setAddressee( loc ); |
504 | subframe = new QVBox( topframe ); | 504 | subframe = new QVBox( topframe ); |
505 | bl->addWidget(subframe ); | 505 | bl->addWidget(subframe ); |
506 | lab = new QLabel( i18n("Remote Addressee"), subframe ); | 506 | lab = new QLabel( i18n("Remote Addressee"), subframe ); |
507 | if ( !takeloc ) | 507 | if ( !takeloc ) |
508 | lab->setBackgroundColor(Qt::green.light() ); | 508 | lab->setBackgroundColor(Qt::green.light() ); |
509 | av = new AddresseeView( subframe ); | 509 | av = new AddresseeView( subframe ); |
510 | av->setAddressee( rem ); | 510 | av->setAddressee( rem ); |
511 | QObject::connect(findButton( Ok ),SIGNAL(clicked()),this, SLOT(slot_remote())); | 511 | QObject::connect(findButton( Ok ),SIGNAL(clicked()),this, SLOT(slot_remote())); |
512 | QObject::connect(this,SIGNAL(user1Clicked()),this, SLOT(slot_local())); | 512 | QObject::connect(this,SIGNAL(user1Clicked()),this, SLOT(slot_local())); |
513 | #ifndef DESKTOP_VERSION | 513 | #ifndef DESKTOP_VERSION |
514 | showMaximized(); | 514 | showMaximized(); |
515 | #else | 515 | #else |
516 | resize ( 640, 400 ); | 516 | resize ( 640, 400 ); |
517 | #endif | 517 | #endif |
518 | } | 518 | } |
519 | 519 | ||
520 | int AddresseeChooser::executeD( bool local ) | 520 | int AddresseeChooser::executeD( bool local ) |
521 | { | 521 | { |
522 | mSyncResult = 3; | 522 | mSyncResult = 3; |
523 | if ( local ) | 523 | if ( local ) |
524 | findButton( User1 )->setFocus(); | 524 | findButton( User1 )->setFocus(); |
525 | else | 525 | else |
526 | findButton( Ok )->setFocus(); | 526 | findButton( Ok )->setFocus(); |
527 | exec(); | 527 | exec(); |
528 | return mSyncResult; | 528 | return mSyncResult; |
529 | } | 529 | } |
530 | void AddresseeChooser::slot_remote() | 530 | void AddresseeChooser::slot_remote() |
531 | { | 531 | { |
532 | mSyncResult = 2; | 532 | mSyncResult = 2; |
533 | accept(); | 533 | accept(); |
534 | } | 534 | } |
535 | void AddresseeChooser::slot_local() | 535 | void AddresseeChooser::slot_local() |
536 | { | 536 | { |
537 | mSyncResult = 1; | 537 | mSyncResult = 1; |
538 | accept(); | 538 | accept(); |
539 | } | 539 | } |
diff --git a/kabc/plugins/file/resourcefile.cpp b/kabc/plugins/file/resourcefile.cpp index dc5932f..4ab7f02 100644 --- a/kabc/plugins/file/resourcefile.cpp +++ b/kabc/plugins/file/resourcefile.cpp | |||
@@ -1,404 +1,421 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of libkabc. | 2 | This file is part of libkabc. |
3 | Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org> | 3 | Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org> |
4 | 4 | ||
5 | This library is free software; you can redistribute it and/or | 5 | This library is free software; you can redistribute it and/or |
6 | modify it under the terms of the GNU Library General Public | 6 | modify it under the terms of the GNU Library General Public |
7 | License as published by the Free Software Foundation; either | 7 | License as published by the Free Software Foundation; either |
8 | version 2 of the License, or (at your option) any later version. | 8 | version 2 of the License, or (at your option) any later version. |
9 | 9 | ||
10 | This library is distributed in the hope that it will be useful, | 10 | This library is distributed in the hope that it will be useful, |
11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
13 | Library General Public License for more details. | 13 | Library General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU Library General Public License | 15 | You should have received a copy of the GNU Library General Public License |
16 | along with this library; see the file COPYING.LIB. If not, write to | 16 | along with this library; see the file COPYING.LIB. If not, write to |
17 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 17 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
18 | Boston, MA 02111-1307, USA. | 18 | Boston, MA 02111-1307, USA. |
19 | */ | 19 | */ |
20 | 20 | ||
21 | /* | 21 | /* |
22 | Enhanced Version of the file for platform independent KDE tools. | 22 | Enhanced Version of the file for platform independent KDE tools. |
23 | Copyright (c) 2004 Ulf Schenk | 23 | Copyright (c) 2004 Ulf Schenk |
24 | 24 | ||
25 | $Id$ | 25 | $Id$ |
26 | */ | 26 | */ |
27 | 27 | ||
28 | #include <sys/types.h> | 28 | #include <sys/types.h> |
29 | #include <sys/stat.h> | 29 | #include <sys/stat.h> |
30 | #ifndef _WIN32_ | 30 | #ifndef _WIN32_ |
31 | #include <unistd.h> | 31 | #include <unistd.h> |
32 | #endif | 32 | #endif |
33 | 33 | ||
34 | #include <qfile.h> | 34 | #include <qfile.h> |
35 | #include <qfileinfo.h> | 35 | #include <qfileinfo.h> |
36 | #include <qregexp.h> | 36 | #include <qregexp.h> |
37 | #include <qtimer.h> | 37 | #include <qtimer.h> |
38 | 38 | ||
39 | #include <kapplication.h> | 39 | #include <kapplication.h> |
40 | #include <kconfig.h> | 40 | #include <kconfig.h> |
41 | #include <kdebug.h> | 41 | #include <kdebug.h> |
42 | #include <klocale.h> | 42 | #include <klocale.h> |
43 | //US #include <ksavefile.h> | 43 | //US #include <ksavefile.h> |
44 | #include <kstandarddirs.h> | 44 | #include <kstandarddirs.h> |
45 | #include <kmessagebox.h> | 45 | #include <kmessagebox.h> |
46 | 46 | ||
47 | #include "formatfactory.h" | 47 | #include "formatfactory.h" |
48 | 48 | ||
49 | #include "resource.h" | 49 | #include "resource.h" |
50 | #include "resourcefileconfig.h" | 50 | #include "resourcefileconfig.h" |
51 | #include "stdaddressbook.h" | 51 | #include "stdaddressbook.h" |
52 | #define NO_DIRWATCH | 52 | #define NO_DIRWATCH |
53 | #include "resourcefile.h" | 53 | #include "resourcefile.h" |
54 | 54 | ||
55 | //#define ALLOW_LOCKING | 55 | //#define ALLOW_LOCKING |
56 | 56 | ||
57 | 57 | ||
58 | |||
59 | using namespace KABC; | 58 | using namespace KABC; |
60 | 59 | ||
61 | extern "C" | 60 | extern "C" |
62 | #ifdef _WIN32_ | 61 | #ifdef _WIN32_ |
63 | __declspec(dllexport) | 62 | __declspec(dllexport) |
64 | #else | 63 | #else |
65 | { | 64 | { |
66 | #endif | 65 | #endif |
67 | 66 | ||
68 | //US void *init_kabc_file() | 67 | //US void *init_kabc_file() |
69 | void *init_microkabc_file() | 68 | void *init_microkabc_file() |
70 | { | 69 | { |
71 | return new KRES::PluginFactory<ResourceFile,ResourceFileConfig>(); | 70 | return new KRES::PluginFactory<ResourceFile,ResourceFileConfig>(); |
72 | } | 71 | } |
73 | #ifndef _WIN32_ | 72 | #ifndef _WIN32_ |
74 | } | 73 | } |
75 | #endif | 74 | #endif |
76 | 75 | ||
77 | ResourceFile::ResourceFile( const KConfig *config ) | 76 | ResourceFile::ResourceFile( const KConfig *config ) |
78 | : Resource( config ) , mFormat( 0 ) | 77 | : Resource( config ) , mFormat( 0 ) |
79 | { | 78 | { |
80 | QString fileName, formatName, default_fileName; | 79 | QString fileName, formatName, default_fileName; |
81 | 80 | ||
82 | default_fileName = StdAddressBook::fileName(); | 81 | default_fileName = StdAddressBook::fileName(); |
83 | 82 | ||
84 | KConfig *cfg = (KConfig *)config; | 83 | KConfig *cfg = (KConfig *)config; |
85 | if ( cfg ) { | 84 | if ( cfg ) { |
86 | fileName = cfg->readEntry( "FileName", default_fileName ); | 85 | fileName = cfg->readEntry( "FileName", default_fileName ); |
87 | formatName = cfg->readEntry( "FileFormat", "vcard" ); | 86 | formatName = cfg->readEntry( "FileFormat", "vcard" ); |
88 | } else { | 87 | } else { |
89 | fileName = default_fileName; | 88 | fileName = default_fileName; |
90 | formatName = "vcard"; | 89 | formatName = "vcard"; |
91 | } | 90 | } |
92 | 91 | ||
93 | init( fileName, formatName ); | 92 | init( fileName, formatName ); |
94 | } | 93 | } |
95 | 94 | ||
96 | ResourceFile::ResourceFile( const QString &fileName , | 95 | ResourceFile::ResourceFile( const QString &fileName , |
97 | const QString &formatName ) | 96 | const QString &formatName ) |
98 | : Resource( 0 ) | 97 | : Resource( 0 ) |
99 | { | 98 | { |
100 | // qDebug("ResourceFile::ResourceFile : 3 %s, %s", fileName.latin1(), formatName.latin1()); | 99 | // qDebug("ResourceFile::ResourceFile : 3 %s, %s", fileName.latin1(), formatName.latin1()); |
100 | |||
101 | |||
102 | |||
101 | init( fileName, formatName ); | 103 | init( fileName, formatName ); |
102 | } | 104 | } |
103 | 105 | ||
104 | void ResourceFile::init( const QString &fileName, const QString &formatName ) | 106 | void ResourceFile::init( const QString &fileName, const QString &formatName ) |
105 | { | 107 | { |
106 | mFormatName = formatName; | 108 | mFormatName = formatName; |
107 | 109 | ||
108 | FormatFactory *factory = FormatFactory::self(); | 110 | FormatFactory *factory = FormatFactory::self(); |
109 | mFormat = factory->format( mFormatName ); | 111 | mFormat = factory->format( mFormatName ); |
110 | 112 | ||
111 | if ( !mFormat ) { | 113 | if ( !mFormat ) { |
112 | mFormatName = "vcard"; | 114 | mFormatName = "vcard"; |
113 | mFormat = factory->format( mFormatName ); | 115 | mFormat = factory->format( mFormatName ); |
114 | } | 116 | } |
115 | 117 | ||
116 | #ifndef NO_DIRWATCH | 118 | #ifndef NO_DIRWATCH |
117 | connect( &mDirWatch, SIGNAL( dirty(const QString&) ), SLOT( fileChanged() ) ); | 119 | connect( &mDirWatch, SIGNAL( dirty(const QString&) ), SLOT( fileChanged() ) ); |
118 | connect( &mDirWatch, SIGNAL( created(const QString&) ), SLOT( fileChanged() ) ); | 120 | connect( &mDirWatch, SIGNAL( created(const QString&) ), SLOT( fileChanged() ) ); |
119 | connect( &mDirWatch, SIGNAL( deleted(const QString&) ), SLOT( fileChanged() ) ); | 121 | connect( &mDirWatch, SIGNAL( deleted(const QString&) ), SLOT( fileChanged() ) ); |
120 | #endif | 122 | #endif |
123 | |||
124 | |||
125 | QString localKdeDir; | ||
126 | localKdeDir = readEnvPath("LOCALMICROKDEHOME"); | ||
127 | if ( ! localKdeDir.isEmpty() ) { | ||
128 | qDebug("LOCALMICROKDEHOME is set to: %s",localKdeDir.latin1() ); | ||
129 | |||
130 | |||
131 | |||
132 | |||
133 | } | ||
134 | qDebug("RESOURCE: %s ", fileName.latin1()); | ||
135 | |||
136 | |||
137 | |||
121 | setFileName( fileName ); | 138 | setFileName( fileName ); |
122 | } | 139 | } |
123 | 140 | ||
124 | ResourceFile::~ResourceFile() | 141 | ResourceFile::~ResourceFile() |
125 | { | 142 | { |
126 | delete mFormat; | 143 | delete mFormat; |
127 | mFormat = 0; | 144 | mFormat = 0; |
128 | } | 145 | } |
129 | 146 | ||
130 | void ResourceFile::writeConfig( KConfig *config ) | 147 | void ResourceFile::writeConfig( KConfig *config ) |
131 | { | 148 | { |
132 | 149 | ||
133 | config->setGroup( "Resource_" + identifier() ); | 150 | config->setGroup( "Resource_" + identifier() ); |
134 | Resource::writeConfig( config ); | 151 | Resource::writeConfig( config ); |
135 | 152 | ||
136 | config->writeEntry( "FileName", mFileName ); | 153 | config->writeEntry( "FileName", fileName() ); |
137 | config->writeEntry( "FileFormat", mFormatName ); | 154 | config->writeEntry( "FileFormat", mFormatName ); |
138 | 155 | ||
139 | // qDebug("ResourceFile::writeConfig format %s, %s", mFileName.latin1(), mFormatName.latin1()); | 156 | // qDebug("ResourceFile::writeConfig format %s, %s", mFileName.latin1(), mFormatName.latin1()); |
140 | 157 | ||
141 | } | 158 | } |
142 | 159 | ||
143 | Ticket *ResourceFile::requestSaveTicket() | 160 | Ticket *ResourceFile::requestSaveTicket() |
144 | { | 161 | { |
145 | kdDebug(5700) << "ResourceFile::requestSaveTicket()" << endl; | 162 | kdDebug(5700) << "ResourceFile::requestSaveTicket()" << endl; |
146 | 163 | ||
147 | if ( !addressBook() ) return 0; | 164 | if ( !addressBook() ) return 0; |
148 | 165 | ||
149 | #ifdef ALLOW_LOCKING | 166 | #ifdef ALLOW_LOCKING |
150 | if ( !lock( mFileName ) ) { | 167 | if ( !lock( mFileName ) ) { |
151 | qDebug("unablt to lock file "); | 168 | qDebug("unablt to lock file "); |
152 | return 0; | 169 | return 0; |
153 | } | 170 | } |
154 | #endif | 171 | #endif |
155 | return createTicket( this ); | 172 | return createTicket( this ); |
156 | } | 173 | } |
157 | 174 | ||
158 | 175 | ||
159 | bool ResourceFile::doOpen() | 176 | bool ResourceFile::doOpen() |
160 | { | 177 | { |
161 | QFile file( mFileName ); | 178 | QFile file( fileName() ); |
162 | qDebug("ResourceFile::openfile %s ", mFileName.latin1()); | 179 | qDebug("ResourceFile::openfile %s ", fileName().latin1()); |
163 | 180 | ||
164 | if ( !file.exists() ) { | 181 | if ( !file.exists() ) { |
165 | // try to create the file | 182 | // try to create the file |
166 | bool ok = file.open( IO_WriteOnly ); | 183 | bool ok = file.open( IO_WriteOnly ); |
167 | if ( ok ) | 184 | if ( ok ) |
168 | file.close(); | 185 | file.close(); |
169 | 186 | ||
170 | return ok; | 187 | return ok; |
171 | } else { | 188 | } else { |
172 | if ( !file.open( IO_ReadWrite ) ) | 189 | if ( !file.open( IO_ReadWrite ) ) |
173 | return false; | 190 | return false; |
174 | 191 | ||
175 | if ( file.size() == 0 ) { | 192 | if ( file.size() == 0 ) { |
176 | file.close(); | 193 | file.close(); |
177 | return true; | 194 | return true; |
178 | } | 195 | } |
179 | 196 | ||
180 | bool ok = mFormat->checkFormat( &file ); | 197 | bool ok = mFormat->checkFormat( &file ); |
181 | file.close(); | 198 | file.close(); |
182 | 199 | ||
183 | return ok; | 200 | return ok; |
184 | } | 201 | } |
185 | } | 202 | } |
186 | 203 | ||
187 | void ResourceFile::doClose() | 204 | void ResourceFile::doClose() |
188 | { | 205 | { |
189 | } | 206 | } |
190 | 207 | ||
191 | bool ResourceFile::load() | 208 | bool ResourceFile::load() |
192 | { | 209 | { |
193 | 210 | ||
194 | QFile file( mFileName ); | 211 | QFile file( fileName() ); |
195 | if ( !file.open( IO_ReadOnly ) ) { | 212 | if ( !file.open( IO_ReadOnly ) ) { |
196 | addressBook()->error( i18n( "Unable to open file '%1'." ).arg( mFileName ) ); | 213 | addressBook()->error( i18n( "Unable to open file '%1'." ).arg( fileName() ) ); |
197 | return false; | 214 | return false; |
198 | } | 215 | } |
199 | 216 | ||
200 | // qDebug("ResourceFile::load format %s, %s", mFileName.latin1(), mFormatName.latin1()); | 217 | // qDebug("ResourceFile::load format %s, %s", mFileName.latin1(), mFormatName.latin1()); |
201 | 218 | ||
202 | return mFormat->loadAll( addressBook(), this, &file ); | 219 | return mFormat->loadAll( addressBook(), this, &file ); |
203 | } | 220 | } |
204 | 221 | ||
205 | bool ResourceFile::save( Ticket *ticket ) | 222 | bool ResourceFile::save( Ticket *ticket ) |
206 | { | 223 | { |
207 | // qDebug("ResourceFile::save format %s, %s", mFileName.latin1(), mFormatName.latin1()); | 224 | // qDebug("ResourceFile::save format %s, %s", mFileName.latin1(), mFormatName.latin1()); |
208 | 225 | ||
209 | 226 | ||
210 | // create backup file | 227 | // create backup file |
211 | QString extension = "_" + QString::number( QDate::currentDate().dayOfWeek() ); | 228 | QString extension = "_" + QString::number( QDate::currentDate().dayOfWeek() ); |
212 | 229 | ||
213 | /*US we use a simpler method to create a backupfile | 230 | /*US we use a simpler method to create a backupfile |
214 | 231 | ||
215 | (void) KSaveFile::backupFile( mFileName, QString::null | 232 | (void) KSaveFile::backupFile( mFileName, QString::null |
216 | ,extension ); | 233 | ,extension ); |
217 | 234 | ||
218 | KSaveFile saveFile( mFileName ); | 235 | KSaveFile saveFile( mFileName ); |
219 | bool ok = false; | 236 | bool ok = false; |
220 | if ( saveFile.status() == 0 && saveFile.file() ) | 237 | if ( saveFile.status() == 0 && saveFile.file() ) |
221 | { | 238 | { |
222 | mFormat->saveAll( addressBook(), this, saveFile.file() ); | 239 | mFormat->saveAll( addressBook(), this, saveFile.file() ); |
223 | ok = saveFile.close(); | 240 | ok = saveFile.close(); |
224 | } | 241 | } |
225 | */ | 242 | */ |
226 | 243 | ||
227 | //US ToDo: write backupfile | 244 | //US ToDo: write backupfile |
228 | #ifndef NO_DIRWATCH | 245 | #ifndef NO_DIRWATCH |
229 | mDirWatch.stopScan(); | 246 | mDirWatch.stopScan(); |
230 | #endif | 247 | #endif |
231 | QFile info; | 248 | QFile info; |
232 | info.setName( mFileName ); | 249 | info.setName( fileName() ); |
233 | bool ok = info.open( IO_WriteOnly ); | 250 | bool ok = info.open( IO_WriteOnly ); |
234 | if ( ok ) { | 251 | if ( ok ) { |
235 | mFormat->saveAll( addressBook(), this, &info ); | 252 | mFormat->saveAll( addressBook(), this, &info ); |
236 | 253 | ||
237 | info.close(); | 254 | info.close(); |
238 | ok = true; | 255 | ok = true; |
239 | } | 256 | } |
240 | else { | 257 | else { |
241 | 258 | ||
242 | } | 259 | } |
243 | 260 | ||
244 | if ( !ok ) | 261 | if ( !ok ) |
245 | addressBook()->error( i18n( "Unable to save file '%1'." ).arg( mFileName ) ); | 262 | addressBook()->error( i18n( "Unable to save file '%1'." ).arg( fileName() ) ); |
246 | #ifndef NO_DIRWATCH | 263 | #ifndef NO_DIRWATCH |
247 | mDirWatch.startScan(); | 264 | mDirWatch.startScan(); |
248 | #endif | 265 | #endif |
249 | delete ticket; | 266 | delete ticket; |
250 | #ifdef ALLOW_LOCKING | 267 | #ifdef ALLOW_LOCKING |
251 | unlock( mFileName ); | 268 | unlock( mFileName ); |
252 | #endif | 269 | #endif |
253 | 270 | ||
254 | return ok; | 271 | return ok; |
255 | } | 272 | } |
256 | 273 | ||
257 | bool ResourceFile::lock( const QString &fileName ) | 274 | bool ResourceFile::lock( const QString &fileName ) |
258 | { | 275 | { |
259 | #ifdef ALLOW_LOCKING | 276 | #ifdef ALLOW_LOCKING |
260 | 277 | ||
261 | 278 | ||
262 | QString fn = fileName; | 279 | QString fn = fileName; |
263 | 280 | ||
264 | //US change the implementation how the lockfilename is getting created | 281 | //US change the implementation how the lockfilename is getting created |
265 | //US fn.replace( QRegExp("/"), "_" ); | 282 | //US fn.replace( QRegExp("/"), "_" ); |
266 | //US QString lockName = locateLocal( "data", "kabc/lock/" + fn + ".lock" ); | 283 | //US QString lockName = locateLocal( "data", "kabc/lock/" + fn + ".lock" ); |
267 | 284 | ||
268 | KURL url(fn); | 285 | KURL url(fn); |
269 | QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" ); | 286 | QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" ); |
270 | 287 | ||
271 | 288 | ||
272 | 289 | ||
273 | if (QFile::exists( lockName )) return false; | 290 | if (QFile::exists( lockName )) return false; |
274 | 291 | ||
275 | QString lockUniqueName; | 292 | QString lockUniqueName; |
276 | lockUniqueName = fn + KApplication::randomString( 8 ); | 293 | lockUniqueName = fn + KApplication::randomString( 8 ); |
277 | 294 | ||
278 | url = lockUniqueName; | 295 | url = lockUniqueName; |
279 | //US mLockUniqueName = locateLocal( "data", "kabc/lock/" + lockUniqueName ); | 296 | //US mLockUniqueName = locateLocal( "data", "kabc/lock/" + lockUniqueName ); |
280 | mLockUniqueName = locateLocal( "data", "kabc/lock/" + url.fileName() ); | 297 | mLockUniqueName = locateLocal( "data", "kabc/lock/" + url.fileName() ); |
281 | kdDebug(5700) << "-- lock unique name: " << mLockUniqueName << endl; | 298 | kdDebug(5700) << "-- lock unique name: " << mLockUniqueName << endl; |
282 | 299 | ||
283 | // Create unique file | 300 | // Create unique file |
284 | QFile file( mLockUniqueName ); | 301 | QFile file( mLockUniqueName ); |
285 | file.open( IO_WriteOnly ); | 302 | file.open( IO_WriteOnly ); |
286 | file.close(); | 303 | file.close(); |
287 | 304 | ||
288 | // Create lock file | 305 | // Create lock file |
289 | int result = 0; | 306 | int result = 0; |
290 | #ifndef _WIN32_ | 307 | #ifndef _WIN32_ |
291 | result = ::link( QFile::encodeName( mLockUniqueName ), | 308 | result = ::link( QFile::encodeName( mLockUniqueName ), |
292 | QFile::encodeName( lockName ) ); | 309 | QFile::encodeName( lockName ) ); |
293 | #endif | 310 | #endif |
294 | if ( result == 0 ) { | 311 | if ( result == 0 ) { |
295 | addressBook()->emitAddressBookLocked(); | 312 | addressBook()->emitAddressBookLocked(); |
296 | return true; | 313 | return true; |
297 | } | 314 | } |
298 | 315 | ||
299 | // TODO: check stat | 316 | // TODO: check stat |
300 | 317 | ||
301 | return false; | 318 | return false; |
302 | #else | 319 | #else |
303 | return true; | 320 | return true; |
304 | #endif | 321 | #endif |
305 | } | 322 | } |
306 | 323 | ||
307 | void ResourceFile::unlock( const QString &fileName ) | 324 | void ResourceFile::unlock( const QString &fileName ) |
308 | { | 325 | { |
309 | #ifdef ALLOW_LOCKING | 326 | #ifdef ALLOW_LOCKING |
310 | QString fn = fileName; | 327 | QString fn = fileName; |
311 | //US change the implementation how the lockfilename is getting created | 328 | //US change the implementation how the lockfilename is getting created |
312 | //US fn.replace( QRegExp( "/" ), "_" ); | 329 | //US fn.replace( QRegExp( "/" ), "_" ); |
313 | //US QString lockName = locateLocal( "data", "kabc/lock/" + fn + ".lock" ); | 330 | //US QString lockName = locateLocal( "data", "kabc/lock/" + fn + ".lock" ); |
314 | //US QString lockName = fn + ".lock"; | 331 | //US QString lockName = fn + ".lock"; |
315 | KURL url(fn); | 332 | KURL url(fn); |
316 | QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" ); | 333 | QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" ); |
317 | 334 | ||
318 | QFile::remove( lockName ); | 335 | QFile::remove( lockName ); |
319 | QFile::remove( mLockUniqueName ); | 336 | QFile::remove( mLockUniqueName ); |
320 | addressBook()->emitAddressBookUnlocked(); | 337 | addressBook()->emitAddressBookUnlocked(); |
321 | #else | 338 | #else |
322 | return; | 339 | return; |
323 | #endif | 340 | #endif |
324 | } | 341 | } |
325 | 342 | ||
326 | void ResourceFile::setFileName( const QString &fileName ) | 343 | void ResourceFile::setFileName( const QString &fileName ) |
327 | { | 344 | { |
328 | #ifndef NO_DIRWATCH | 345 | #ifndef NO_DIRWATCH |
329 | mDirWatch.stopScan(); | 346 | mDirWatch.stopScan(); |
330 | mDirWatch.removeFile( mFileName ); | 347 | mDirWatch.removeFile( mFileName ); |
331 | mFileName = fileName; | 348 | mFileName = fileName; |
332 | 349 | ||
333 | 350 | ||
334 | mDirWatch.addFile( mFileName ); | 351 | mDirWatch.addFile( mFileName ); |
335 | mDirWatch.startScan(); | 352 | mDirWatch.startScan(); |
336 | #else | 353 | #else |
337 | mFileName = fileName; | 354 | mFileName2 = fileName; |
338 | #endif | 355 | #endif |
339 | 356 | ||
340 | //US simulate KDirWatch event | 357 | //US simulate KDirWatch event |
341 | //US fileChanged(); | 358 | //US fileChanged(); |
342 | } | 359 | } |
343 | 360 | ||
344 | QString ResourceFile::fileName() const | 361 | QString ResourceFile::fileName() const |
345 | { | 362 | { |
346 | return mFileName; | 363 | return mFileName2; |
347 | } | 364 | } |
348 | 365 | ||
349 | void ResourceFile::setFormat( const QString &format ) | 366 | void ResourceFile::setFormat( const QString &format ) |
350 | { | 367 | { |
351 | mFormatName = format; | 368 | mFormatName = format; |
352 | delete mFormat; | 369 | delete mFormat; |
353 | 370 | ||
354 | FormatFactory *factory = FormatFactory::self(); | 371 | FormatFactory *factory = FormatFactory::self(); |
355 | mFormat = factory->format( mFormatName ); | 372 | mFormat = factory->format( mFormatName ); |
356 | /*US | 373 | /*US |
357 | //qDebug("ResourceFile::setFormat initialized with format %s ", format.latin1()); | 374 | //qDebug("ResourceFile::setFormat initialized with format %s ", format.latin1()); |
358 | if (mFormatName == "vcard") { | 375 | if (mFormatName == "vcard") { |
359 | mFormat = new VCardFormatPlugin2(); | 376 | mFormat = new VCardFormatPlugin2(); |
360 | // qDebug("ResourceFile::setFormat format %s", mFormatName.latin1()); | 377 | // qDebug("ResourceFile::setFormat format %s", mFormatName.latin1()); |
361 | } | 378 | } |
362 | else if (mFormatName == "binary") { | 379 | else if (mFormatName == "binary") { |
363 | mFormat = new BinaryFormat(); | 380 | mFormat = new BinaryFormat(); |
364 | // qDebug("ResourceFile::setFormat format %s", mFormatName.latin1()); | 381 | // qDebug("ResourceFile::setFormat format %s", mFormatName.latin1()); |
365 | } | 382 | } |
366 | else | 383 | else |
367 | qDebug("ResourceFile::setFormat format unknown !!! %s ", format.latin1()); | 384 | qDebug("ResourceFile::setFormat format unknown !!! %s ", format.latin1()); |
368 | */ | 385 | */ |
369 | 386 | ||
370 | } | 387 | } |
371 | 388 | ||
372 | QString ResourceFile::format() const | 389 | QString ResourceFile::format() const |
373 | { | 390 | { |
374 | return mFormatName; | 391 | return mFormatName; |
375 | } | 392 | } |
376 | 393 | ||
377 | void ResourceFile::fileChanged() | 394 | void ResourceFile::fileChanged() |
378 | { | 395 | { |
379 | // There is a small theoretical chance that KDirWatch calls us before | 396 | // There is a small theoretical chance that KDirWatch calls us before |
380 | // we are fully constructed | 397 | // we are fully constructed |
381 | if (!addressBook()) | 398 | if (!addressBook()) |
382 | return; | 399 | return; |
383 | 400 | ||
384 | 401 | ||
385 | QString text( i18n( "File resource '%1'<br> has been changed by third party.<br>Do you want to reload?").arg( mFileName ) ); | 402 | QString text( i18n( "File resource '%1'<br> has been changed by third party.<br>Do you want to reload?").arg( fileName() ) ); |
386 | if ( readOnly() || KMessageBox::questionYesNo( 0, text ) == KMessageBox::Yes ) { | 403 | if ( readOnly() || KMessageBox::questionYesNo( 0, text ) == KMessageBox::Yes ) { |
387 | load(); | 404 | load(); |
388 | addressBook()->emitAddressBookChanged(); | 405 | addressBook()->emitAddressBookChanged(); |
389 | } | 406 | } |
390 | } | 407 | } |
391 | 408 | ||
392 | void ResourceFile::removeAddressee( const Addressee &addr ) | 409 | void ResourceFile::removeAddressee( const Addressee &addr ) |
393 | { | 410 | { |
394 | QFile::remove( QFile::encodeName( locateLocal( "data", "kabc/photos/" ) + addr.uid() ) ); | 411 | QFile::remove( QFile::encodeName( locateLocal( "data", "kabc/photos/" ) + addr.uid() ) ); |
395 | QFile::remove( QFile::encodeName( locateLocal( "data", "kabc/logos/" ) + addr.uid() ) ); | 412 | QFile::remove( QFile::encodeName( locateLocal( "data", "kabc/logos/" ) + addr.uid() ) ); |
396 | QFile::remove( QFile::encodeName( locateLocal( "data", "kabc/sounds/" ) + addr.uid() ) ); | 413 | QFile::remove( QFile::encodeName( locateLocal( "data", "kabc/sounds/" ) + addr.uid() ) ); |
397 | } | 414 | } |
398 | 415 | ||
399 | void ResourceFile::cleanUp() | 416 | void ResourceFile::cleanUp() |
400 | { | 417 | { |
401 | unlock( mFileName ); | 418 | unlock( fileName() ); |
402 | } | 419 | } |
403 | 420 | ||
404 | //US #include "resourcefile.moc" | 421 | //US #include "resourcefile.moc" |
diff --git a/kabc/plugins/file/resourcefile.h b/kabc/plugins/file/resourcefile.h index b4421b2..dd38a9d 100644 --- a/kabc/plugins/file/resourcefile.h +++ b/kabc/plugins/file/resourcefile.h | |||
@@ -1,163 +1,163 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of libkabc. | 2 | This file is part of libkabc. |
3 | Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org> | 3 | Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org> |
4 | 4 | ||
5 | This library is free software; you can redistribute it and/or | 5 | This library is free software; you can redistribute it and/or |
6 | modify it under the terms of the GNU Library General Public | 6 | modify it under the terms of the GNU Library General Public |
7 | License as published by the Free Software Foundation; either | 7 | License as published by the Free Software Foundation; either |
8 | version 2 of the License, or (at your option) any later version. | 8 | version 2 of the License, or (at your option) any later version. |
9 | 9 | ||
10 | This library is distributed in the hope that it will be useful, | 10 | This library is distributed in the hope that it will be useful, |
11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
13 | Library General Public License for more details. | 13 | Library General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU Library General Public License | 15 | You should have received a copy of the GNU Library General Public License |
16 | along with this library; see the file COPYING.LIB. If not, write to | 16 | along with this library; see the file COPYING.LIB. If not, write to |
17 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 17 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
18 | Boston, MA 02111-1307, USA. | 18 | Boston, MA 02111-1307, USA. |
19 | */ | 19 | */ |
20 | 20 | ||
21 | /* | 21 | /* |
22 | Enhanced Version of the file for platform independent KDE tools. | 22 | Enhanced Version of the file for platform independent KDE tools. |
23 | Copyright (c) 2004 Ulf Schenk | 23 | Copyright (c) 2004 Ulf Schenk |
24 | 24 | ||
25 | $Id$ | 25 | $Id$ |
26 | */ | 26 | */ |
27 | 27 | ||
28 | 28 | ||
29 | #ifndef KABC_RESOURCEFILE_H | 29 | #ifndef KABC_RESOURCEFILE_H |
30 | #define KABC_RESOURCEFILE_H | 30 | #define KABC_RESOURCEFILE_H |
31 | 31 | ||
32 | #include <kconfig.h> | 32 | #include <kconfig.h> |
33 | #include <kdirwatch.h> | 33 | #include <kdirwatch.h> |
34 | 34 | ||
35 | #include <sys/types.h> | 35 | #include <sys/types.h> |
36 | 36 | ||
37 | #include <resource.h> | 37 | #include <resource.h> |
38 | 38 | ||
39 | class QTimer; | 39 | class QTimer; |
40 | class FormatPlugin; | 40 | class FormatPlugin; |
41 | 41 | ||
42 | namespace KABC { | 42 | namespace KABC { |
43 | 43 | ||
44 | //US class FormatPlugin; | 44 | //US class FormatPlugin; |
45 | class ResourceConfigWidget; | 45 | class ResourceConfigWidget; |
46 | 46 | ||
47 | /** | 47 | /** |
48 | @internal | 48 | @internal |
49 | */ | 49 | */ |
50 | class ResourceFile : public Resource | 50 | class ResourceFile : public Resource |
51 | { | 51 | { |
52 | Q_OBJECT | 52 | Q_OBJECT |
53 | 53 | ||
54 | public: | 54 | public: |
55 | 55 | ||
56 | /** | 56 | /** |
57 | Constructor. | 57 | Constructor. |
58 | 58 | ||
59 | @param cfg The config object where custom resource settings are stored. | 59 | @param cfg The config object where custom resource settings are stored. |
60 | */ | 60 | */ |
61 | ResourceFile( const KConfig *cfg ); | 61 | ResourceFile( const KConfig *cfg ); |
62 | 62 | ||
63 | /** | 63 | /** |
64 | Construct file resource on file @arg fileName using format @arg formatName. | 64 | Construct file resource on file @arg fileName using format @arg formatName. |
65 | */ | 65 | */ |
66 | ResourceFile( const QString &fileName , const QString &formatName = "vcard" ); | 66 | ResourceFile( const QString &fileName , const QString &formatName = "vcard" ); |
67 | 67 | ||
68 | /** | 68 | /** |
69 | * Destructor. | 69 | * Destructor. |
70 | */ | 70 | */ |
71 | ~ResourceFile(); | 71 | ~ResourceFile(); |
72 | 72 | ||
73 | /** | 73 | /** |
74 | Writes the config back. | 74 | Writes the config back. |
75 | */ | 75 | */ |
76 | virtual void writeConfig( KConfig *cfg ); | 76 | virtual void writeConfig( KConfig *cfg ); |
77 | 77 | ||
78 | /** | 78 | /** |
79 | * Tries to open the file and checks for the proper format. | 79 | * Tries to open the file and checks for the proper format. |
80 | * This method should be called before @ref load(). | 80 | * This method should be called before @ref load(). |
81 | */ | 81 | */ |
82 | virtual bool doOpen(); | 82 | virtual bool doOpen(); |
83 | 83 | ||
84 | /** | 84 | /** |
85 | * Closes the file again. | 85 | * Closes the file again. |
86 | */ | 86 | */ |
87 | virtual void doClose(); | 87 | virtual void doClose(); |
88 | 88 | ||
89 | /** | 89 | /** |
90 | * Requests a save ticket, that is used by @ref save() | 90 | * Requests a save ticket, that is used by @ref save() |
91 | */ | 91 | */ |
92 | virtual Ticket *requestSaveTicket(); | 92 | virtual Ticket *requestSaveTicket(); |
93 | 93 | ||
94 | /** | 94 | /** |
95 | * Loads all addressees from file to the address book. | 95 | * Loads all addressees from file to the address book. |
96 | * Returns true if all addressees could be loaded otherwise false. | 96 | * Returns true if all addressees could be loaded otherwise false. |
97 | */ | 97 | */ |
98 | virtual bool load(); | 98 | virtual bool load(); |
99 | 99 | ||
100 | /** | 100 | /** |
101 | * Saves all addresses from address book to file. | 101 | * Saves all addresses from address book to file. |
102 | * Returns true if all addressees could be saved otherwise false. | 102 | * Returns true if all addressees could be saved otherwise false. |
103 | * | 103 | * |
104 | * @param ticket The ticket returned by @ref requestSaveTicket() | 104 | * @param ticket The ticket returned by @ref requestSaveTicket() |
105 | */ | 105 | */ |
106 | virtual bool save( Ticket *ticket ); | 106 | virtual bool save( Ticket *ticket ); |
107 | 107 | ||
108 | /** | 108 | /** |
109 | * Set name of file to be used for saving. | 109 | * Set name of file to be used for saving. |
110 | */ | 110 | */ |
111 | void setFileName( const QString & ); | 111 | void setFileName( const QString & ); |
112 | 112 | ||
113 | /** | 113 | /** |
114 | * Return name of file used for loading and saving the address book. | 114 | * Return name of file used for loading and saving the address book. |
115 | */ | 115 | */ |
116 | QString fileName() const; | 116 | QString fileName() const; |
117 | 117 | ||
118 | /** | 118 | /** |
119 | Sets a new format by name. | 119 | Sets a new format by name. |
120 | */ | 120 | */ |
121 | void setFormat( const QString &name ); | 121 | void setFormat( const QString &name ); |
122 | 122 | ||
123 | /** | 123 | /** |
124 | Returns the format name. | 124 | Returns the format name. |
125 | */ | 125 | */ |
126 | QString format() const; | 126 | QString format() const; |
127 | 127 | ||
128 | /** | 128 | /** |
129 | * Remove a addressee from its source. | 129 | * Remove a addressee from its source. |
130 | * This method is mainly called by KABC::AddressBook. | 130 | * This method is mainly called by KABC::AddressBook. |
131 | */ | 131 | */ |
132 | virtual void removeAddressee( const Addressee& addr ); | 132 | virtual void removeAddressee( const Addressee& addr ); |
133 | 133 | ||
134 | /** | 134 | /** |
135 | * This method is called by an error handler if the application | 135 | * This method is called by an error handler if the application |
136 | * crashed | 136 | * crashed |
137 | */ | 137 | */ |
138 | virtual void cleanUp(); | 138 | virtual void cleanUp(); |
139 | 139 | ||
140 | protected slots: | 140 | protected slots: |
141 | void fileChanged(); | 141 | void fileChanged(); |
142 | 142 | ||
143 | protected: | 143 | protected: |
144 | void init( const QString &fileName, const QString &format ); | 144 | void init( const QString &fileName, const QString &format ); |
145 | 145 | ||
146 | bool lock( const QString &fileName ); | 146 | bool lock( const QString &fileName ); |
147 | void unlock( const QString &fileName ); | 147 | void unlock( const QString &fileName ); |
148 | 148 | ||
149 | private: | 149 | private: |
150 | QString mFileName; | 150 | QString mFileName2; |
151 | QString mFormatName; | 151 | QString mFormatName; |
152 | 152 | ||
153 | FormatPlugin *mFormat; | 153 | FormatPlugin *mFormat; |
154 | 154 | ||
155 | QString mLockUniqueName; | 155 | QString mLockUniqueName; |
156 | #ifndef NO_DIRWATCH | 156 | #ifndef NO_DIRWATCH |
157 | KDirWatch mDirWatch; | 157 | KDirWatch mDirWatch; |
158 | #endif | 158 | #endif |
159 | }; | 159 | }; |
160 | 160 | ||
161 | } | 161 | } |
162 | 162 | ||
163 | #endif | 163 | #endif |
diff --git a/microkde/kdatetbl.cpp b/microkde/kdatetbl.cpp index d182279..2d97c8c 100644 --- a/microkde/kdatetbl.cpp +++ b/microkde/kdatetbl.cpp | |||
@@ -1,939 +1,939 @@ | |||
1 | /* -*- C++ -*- | 1 | /* -*- C++ -*- |
2 | This file is part of the KDE libraries | 2 | This file is part of the KDE libraries |
3 | Copyright (C) 1997 Tim D. Gilman (tdgilman@best.org) | 3 | Copyright (C) 1997 Tim D. Gilman (tdgilman@best.org) |
4 | (C) 1998-2001 Mirko Boehm (mirko@kde.org) | 4 | (C) 1998-2001 Mirko Boehm (mirko@kde.org) |
5 | This library is free software; you can redistribute it and/or | 5 | This library is free software; you can redistribute it and/or |
6 | modify it under the terms of the GNU Library General Public | 6 | modify it under the terms of the GNU Library General Public |
7 | License as published by the Free Software Foundation; either | 7 | License as published by the Free Software Foundation; either |
8 | version 2 of the License, or (at your option) any later version. | 8 | version 2 of the License, or (at your option) any later version. |
9 | 9 | ||
10 | This library is distributed in the hope that it will be useful, | 10 | This library is distributed in the hope that it will be useful, |
11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
13 | Library General Public License for more details. | 13 | Library General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU Library General Public License | 15 | You should have received a copy of the GNU Library General Public License |
16 | along with this library; see the file COPYING.LIB. If not, write to | 16 | along with this library; see the file COPYING.LIB. If not, write to |
17 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 17 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
18 | Boston, MA 02111-1307, USA. | 18 | Boston, MA 02111-1307, USA. |
19 | */ | 19 | */ |
20 | 20 | ||
21 | /////////////////// KDateTable widget class ////////////////////// | 21 | /////////////////// KDateTable widget class ////////////////////// |
22 | // | 22 | // |
23 | // Copyright (C) 1997 Tim D. Gilman | 23 | // Copyright (C) 1997 Tim D. Gilman |
24 | // (C) 1998-2001 Mirko Boehm | 24 | // (C) 1998-2001 Mirko Boehm |
25 | // Written using Qt (http://www.troll.no) for the | 25 | // Written using Qt (http://www.troll.no) for the |
26 | // KDE project (http://www.kde.org) | 26 | // KDE project (http://www.kde.org) |
27 | // | 27 | // |
28 | // This is a support class for the KDatePicker class. It just | 28 | // This is a support class for the KDatePicker class. It just |
29 | // draws the calender table without titles, but could theoretically | 29 | // draws the calender table without titles, but could theoretically |
30 | // be used as a standalone. | 30 | // be used as a standalone. |
31 | // | 31 | // |
32 | // When a date is selected by the user, it emits a signal: | 32 | // When a date is selected by the user, it emits a signal: |
33 | // dateSelected(QDate) | 33 | // dateSelected(QDate) |
34 | 34 | ||
35 | #include <kglobal.h> | 35 | #include <kglobal.h> |
36 | #include <kglobalsettings.h> | 36 | #include <kglobalsettings.h> |
37 | #include <kapplication.h> | 37 | #include <kapplication.h> |
38 | #include <klocale.h> | 38 | #include <klocale.h> |
39 | #include <kdebug.h> | 39 | #include <kdebug.h> |
40 | #include <knotifyclient.h> | 40 | #include <knotifyclient.h> |
41 | #include "kdatetbl.h" | 41 | #include "kdatetbl.h" |
42 | #include <qdatetime.h> | 42 | #include <qdatetime.h> |
43 | #include <qstring.h> | 43 | #include <qstring.h> |
44 | #include <qpen.h> | 44 | #include <qpen.h> |
45 | #include <qpainter.h> | 45 | #include <qpainter.h> |
46 | #include <qdialog.h> | 46 | #include <qdialog.h> |
47 | #include <assert.h> | 47 | #include <assert.h> |
48 | #include <qapplication.h> | 48 | #include <qapplication.h> |
49 | 49 | ||
50 | KDateValidator::KDateValidator(QWidget* parent, const char* name) | 50 | KDateValidator::KDateValidator(QWidget* parent, const char* name) |
51 | : QValidator(parent, name) | 51 | : QValidator(parent, name) |
52 | { | 52 | { |
53 | } | 53 | } |
54 | 54 | ||
55 | QValidator::State | 55 | QValidator::State |
56 | KDateValidator::validate(QString& text, int&) const | 56 | KDateValidator::validate(QString& text, int&) const |
57 | { | 57 | { |
58 | QDate temp; | 58 | QDate temp; |
59 | // ----- everything is tested in date(): | 59 | // ----- everything is tested in date(): |
60 | return date(text, temp); | 60 | return date(text, temp); |
61 | } | 61 | } |
62 | 62 | ||
63 | QValidator::State | 63 | QValidator::State |
64 | KDateValidator::date(const QString& text, QDate& d) const | 64 | KDateValidator::date(const QString& text, QDate& d) const |
65 | { | 65 | { |
66 | QDate tmp = KGlobal::locale()->readDate(text); | 66 | QDate tmp = KGlobal::locale()->readDate(text); |
67 | if (!tmp.isNull()) | 67 | if (!tmp.isNull()) |
68 | { | 68 | { |
69 | d = tmp; | 69 | d = tmp; |
70 | return Acceptable; | 70 | return Acceptable; |
71 | } else | 71 | } else |
72 | return Valid; | 72 | return Valid; |
73 | } | 73 | } |
74 | 74 | ||
75 | void | 75 | void |
76 | KDateValidator::fixup( QString& ) const | 76 | KDateValidator::fixup( QString& ) const |
77 | { | 77 | { |
78 | 78 | ||
79 | } | 79 | } |
80 | 80 | ||
81 | KDateTable::KDateTable(QWidget *parent, QDate date_, const char* name, WFlags f) | 81 | KDateTable::KDateTable(QWidget *parent, QDate date_, const char* name, WFlags f) |
82 | : QGridView(parent, name, f) | 82 | : QGridView(parent, name, f) |
83 | { | 83 | { |
84 | setFont( KGlobalSettings::generalFont() ); | 84 | setFont( KGlobalSettings::generalFont() ); |
85 | if(!date_.isValid()) | 85 | if(!date_.isValid()) |
86 | { | 86 | { |
87 | date_=QDate::currentDate(); | 87 | date_=QDate::currentDate(); |
88 | } | 88 | } |
89 | setFocusPolicy( QWidget::StrongFocus ); | 89 | setFocusPolicy( QWidget::StrongFocus ); |
90 | setNumRows(7); // 6 weeks max + headline | 90 | setNumRows(7); // 6 weeks max + headline |
91 | setNumCols(7); // 7 days a week | 91 | setNumCols(7); // 7 days a week |
92 | setHScrollBarMode(AlwaysOff); | 92 | setHScrollBarMode(AlwaysOff); |
93 | setVScrollBarMode(AlwaysOff); | 93 | setVScrollBarMode(AlwaysOff); |
94 | viewport()->setBackgroundColor(QColor(220,245,255)); | 94 | viewport()->setBackgroundColor(QColor(220,245,255)); |
95 | #if 0 | 95 | #if 0 |
96 | viewport()->setEraseColor(lightGray); | 96 | viewport()->setEraseColor(lightGray); |
97 | #endif | 97 | #endif |
98 | mMarkCurrent = false; | 98 | mMarkCurrent = false; |
99 | setDate(date_); // this initializes firstday, numdays, numDaysPrevMonth | 99 | setDate(date_); // this initializes firstday, numdays, numDaysPrevMonth |
100 | } | 100 | } |
101 | 101 | ||
102 | void | 102 | void |
103 | KDateTable::paintCell(QPainter *painter, int row, int col) | 103 | KDateTable::paintCell(QPainter *painter, int row, int col) |
104 | { | 104 | { |
105 | QRect rect; | 105 | QRect rect; |
106 | QString text; | 106 | QString text; |
107 | QPen pen; | 107 | QPen pen; |
108 | int w=cellWidth(); | 108 | int w=cellWidth(); |
109 | int h=cellHeight(); | 109 | int h=cellHeight(); |
110 | int pos; | 110 | int pos; |
111 | QBrush brushBlue(blue); | 111 | QBrush brushBlue(blue); |
112 | QBrush brushLightblue(QColor(220,245,255)); | 112 | QBrush brushLightblue(QColor(220,245,255)); |
113 | QFont _font=font(); | 113 | QFont _font=font(); |
114 | // ----- | 114 | // ----- |
115 | if(row==0) | 115 | if(row==0) |
116 | { // we are drawing the headline | 116 | { // we are drawing the headline |
117 | _font.setBold(true); | 117 | _font.setBold(true); |
118 | painter->setFont(_font); | 118 | painter->setFont(_font); |
119 | bool normalday = true; | 119 | bool normalday = true; |
120 | QString daystr; | 120 | QString daystr; |
121 | if (KGlobal::locale()->weekStartsMonday()) | 121 | if (KGlobal::locale()->weekStartsMonday()) |
122 | { | 122 | { |
123 | daystr = KGlobal::locale()->weekDayName(col+1, true); | 123 | daystr = KGlobal::locale()->weekDayName(col+1, true); |
124 | if (col == 5 || col == 6) | 124 | if (col == 5 || col == 6) |
125 | normalday = false; | 125 | normalday = false; |
126 | } else { | 126 | } else { |
127 | daystr = KGlobal::locale()->weekDayName(col==0? 7 : col, true); | 127 | daystr = KGlobal::locale()->weekDayName(col==0? 7 : col, true); |
128 | if (col == 0 || col == 6) | 128 | if (col == 0 || col == 6) |
129 | normalday = false; | 129 | normalday = false; |
130 | } | 130 | } |
131 | if (!normalday) | 131 | if (!normalday) |
132 | { | 132 | { |
133 | painter->setPen(QColor(220,245,255)); | 133 | painter->setPen(QColor(220,245,255)); |
134 | painter->setBrush(brushLightblue); | 134 | painter->setBrush(brushLightblue); |
135 | painter->drawRect(0, 0, w, h); | 135 | painter->drawRect(0, 0, w, h); |
136 | painter->setPen(blue); | 136 | painter->setPen(blue); |
137 | } else { | 137 | } else { |
138 | painter->setPen(blue); | 138 | painter->setPen(blue); |
139 | painter->setBrush(brushBlue); | 139 | painter->setBrush(brushBlue); |
140 | painter->drawRect(0, 0, w, h); | 140 | painter->drawRect(0, 0, w, h); |
141 | painter->setPen(white); | 141 | painter->setPen(white); |
142 | } | 142 | } |
143 | painter->drawText(0, 0, w, h-1, AlignCenter, | 143 | painter->drawText(0, 0, w, h-1, AlignCenter, |
144 | daystr, -1, &rect); | 144 | daystr, -1, &rect); |
145 | painter->setPen(black); | 145 | painter->setPen(black); |
146 | painter->moveTo(0, h-1); | 146 | painter->moveTo(0, h-1); |
147 | painter->lineTo(w-1, h-1); | 147 | painter->lineTo(w-1, h-1); |
148 | // ----- draw the weekday: | 148 | // ----- draw the weekday: |
149 | } else { | 149 | } else { |
150 | painter->setFont(_font); | 150 | painter->setFont(_font); |
151 | pos=7*(row-1)+col; | 151 | pos=7*(row-1)+col; |
152 | if (KGlobal::locale()->weekStartsMonday()) | 152 | if (KGlobal::locale()->weekStartsMonday()) |
153 | pos++; | 153 | pos++; |
154 | if(pos<firstday || (firstday+numdays<=pos)) | 154 | if(pos<firstday || (firstday+numdays<=pos)) |
155 | { // we are either | 155 | { // we are either |
156 | // ° painting a day of the previous month or | 156 | // ° painting a day of the previous month or |
157 | // ° painting a day of the following month | 157 | // ° painting a day of the following month |
158 | if(pos<firstday) | 158 | if(pos<firstday) |
159 | { // previous month | 159 | { // previous month |
160 | text.setNum(numDaysPrevMonth+pos-firstday+1); | 160 | text.setNum(numDaysPrevMonth+pos-firstday+1); |
161 | } else { // following month | 161 | } else { // following month |
162 | text.setNum(pos-firstday-numdays+1); | 162 | text.setNum(pos-firstday-numdays+1); |
163 | } | 163 | } |
164 | painter->setPen(gray); | 164 | painter->setPen(gray); |
165 | } else { // paint a day of the current month | 165 | } else { // paint a day of the current month |
166 | text.setNum(pos-firstday+1); | 166 | text.setNum(pos-firstday+1); |
167 | painter->setPen(black); | 167 | painter->setPen(black); |
168 | } | 168 | } |
169 | 169 | ||
170 | pen=painter->pen(); | 170 | pen=painter->pen(); |
171 | if(firstday+date.day()-1==pos) | 171 | if(firstday+date.day()-1==pos) |
172 | { | 172 | { |
173 | if(mMarkCurrent && firstday+QDate::currentDate().day()-1==pos) | 173 | if(mMarkCurrent && firstday+QDate::currentDate().day()-1==pos) |
174 | painter->setPen(green); | 174 | painter->setPen(green); |
175 | else | 175 | else |
176 | painter->setPen(red); | 176 | painter->setPen(red); |
177 | if(hasFocus()) | 177 | if(hasFocus()) |
178 | { | 178 | { |
179 | painter->setBrush(darkRed); | 179 | painter->setBrush(darkRed); |
180 | pen=white; | 180 | pen=white; |
181 | } else { | 181 | } else { |
182 | painter->setBrush(darkGray); | 182 | painter->setBrush(darkGray); |
183 | pen=white; | 183 | pen=white; |
184 | } | 184 | } |
185 | } else { | 185 | } else { |
186 | if(mMarkCurrent && firstday+QDate::currentDate().day()-1==pos) | 186 | if(mMarkCurrent && firstday+QDate::currentDate().day()-1==pos) |
187 | { | 187 | { |
188 | painter->setPen(green); | 188 | painter->setPen(green); |
189 | painter->setBrush(darkGreen); | 189 | painter->setBrush(darkGreen); |
190 | pen=white; | 190 | pen=white; |
191 | } else { | 191 | } else { |
192 | painter->setBrush(QColor(220,245,255)); | 192 | painter->setBrush(QColor(220,245,255)); |
193 | painter->setPen(QColor(220,245,255)); | 193 | painter->setPen(QColor(220,245,255)); |
194 | } | 194 | } |
195 | } | 195 | } |
196 | painter->drawRect(0, 0, w, h); | 196 | painter->drawRect(0, 0, w, h); |
197 | painter->setPen(pen); | 197 | painter->setPen(pen); |
198 | painter->drawText(0, 0, w, h, AlignCenter, text, -1, &rect); | 198 | painter->drawText(0, 0, w, h, AlignCenter, text, -1, &rect); |
199 | } | 199 | } |
200 | /* | 200 | /* |
201 | if(rect.width()>maxCell.width()) maxCell.setWidth(rect.width()); | 201 | if(rect.width()>maxCell.width()) maxCell.setWidth(rect.width()); |
202 | if(rect.height()>maxCell.height()) { | 202 | if(rect.height()>maxCell.height()) { |
203 | maxCell.setHeight(rect.height()); | 203 | maxCell.setHeight(rect.height()); |
204 | } | 204 | } |
205 | */ | 205 | */ |
206 | } | 206 | } |
207 | 207 | ||
208 | void | 208 | void |
209 | KDateTable::keyPressEvent( QKeyEvent *e ) | 209 | KDateTable::keyPressEvent( QKeyEvent *e ) |
210 | { | 210 | { |
211 | /* | 211 | /* |
212 | // not working properly | 212 | // not working properly |
213 | if ( e->key() == Qt::Key_Prior ) { | 213 | if ( e->key() == Qt::Key_Prior ) { |
214 | if ( date.month() == 1 ) { | 214 | if ( date.month() == 1 ) { |
215 | KNotifyClient::beep(); | 215 | KNotifyClient::beep(); |
216 | return; | 216 | return; |
217 | } | 217 | } |
218 | int day = date.day(); | 218 | int day = date.day(); |
219 | if ( day > 27 ) | 219 | if ( day > 27 ) |
220 | while ( !QDate::isValid( date.year(), date.month()-1, day ) ) | 220 | while ( !QDate::isValid( date.year(), date.month()-1, day ) ) |
221 | day--; | 221 | day--; |
222 | setDate(QDate(date.year(), date.month()-1, day)); | 222 | setDate(QDate(date.year(), date.month()-1, day)); |
223 | return; | 223 | return; |
224 | } | 224 | } |
225 | if ( e->key() == Qt::Key_Next ) { | 225 | if ( e->key() == Qt::Key_Next ) { |
226 | if ( date.month() == 12 ) { | 226 | if ( date.month() == 12 ) { |
227 | KNotifyClient::beep(); | 227 | KNotifyClient::beep(); |
228 | return; | 228 | return; |
229 | } | 229 | } |
230 | int day = date.day(); | 230 | int day = date.day(); |
231 | if ( day > 27 ) | 231 | if ( day > 27 ) |
232 | while ( !QDate::isValid( date.year(), date.month()+1, day ) ) | 232 | while ( !QDate::isValid( date.year(), date.month()+1, day ) ) |
233 | day--; | 233 | day--; |
234 | setDate(QDate(date.year(), date.month()+1, day)); | 234 | setDate(QDate(date.year(), date.month()+1, day)); |
235 | return; | 235 | return; |
236 | } | 236 | } |
237 | */ | 237 | */ |
238 | int dayoff = KGlobal::locale()->weekStartsMonday() ? 1 : 0; | 238 | int dayoff = KGlobal::locale()->weekStartsMonday() ? 1 : 0; |
239 | 239 | ||
240 | int temp=firstday+date.day()-dayoff; | 240 | int temp=firstday+date.day()-dayoff; |
241 | int pos = temp; | 241 | int pos = temp; |
242 | bool irgnore = true; | 242 | bool irgnore = true; |
243 | if ( e->state() != Qt::ControlButton ) { | 243 | if ( e->state() != Qt::ControlButton ) { |
244 | if ( e->key() == Qt::Key_Up ) { | 244 | if ( e->key() == Qt::Key_Up ) { |
245 | pos -= 7; | 245 | pos -= 7; |
246 | irgnore = false; | 246 | irgnore = false; |
247 | } | 247 | } |
248 | if ( e->key() == Qt::Key_Down ) { | 248 | if ( e->key() == Qt::Key_Down ) { |
249 | pos += 7; | 249 | pos += 7; |
250 | irgnore = false; | 250 | irgnore = false; |
251 | } | 251 | } |
252 | if ( e->key() == Qt::Key_Left ) { | 252 | if ( e->key() == Qt::Key_Left ) { |
253 | pos--; | 253 | pos--; |
254 | irgnore = false; | 254 | irgnore = false; |
255 | } | 255 | } |
256 | if ( e->key() == Qt::Key_Right ) { | 256 | if ( e->key() == Qt::Key_Right ) { |
257 | pos++; | 257 | pos++; |
258 | irgnore = false; | 258 | irgnore = false; |
259 | } | 259 | } |
260 | } | 260 | } |
261 | if ( irgnore ) | 261 | if ( irgnore ) |
262 | e->ignore(); | 262 | e->ignore(); |
263 | 263 | ||
264 | if(pos+dayoff<=firstday) | 264 | if(pos+dayoff<=firstday) |
265 | { // this day is in the previous month | 265 | { // this day is in the previous month |
266 | KNotifyClient::beep(); | 266 | KNotifyClient::beep(); |
267 | return; | 267 | return; |
268 | } | 268 | } |
269 | if(firstday+numdays<pos+dayoff) | 269 | if(firstday+numdays<pos+dayoff) |
270 | { // this date is in the next month | 270 | { // this date is in the next month |
271 | KNotifyClient::beep(i18n( "Month not long enough" )); | 271 | KNotifyClient::beep(i18n( "Month not long enough" )); |
272 | return; | 272 | return; |
273 | } | 273 | } |
274 | 274 | ||
275 | if ( pos == temp ) | 275 | if ( pos == temp ) |
276 | return; | 276 | return; |
277 | 277 | ||
278 | setDate(QDate(date.year(), date.month(), pos-firstday+dayoff)); | 278 | setDate(QDate(date.year(), date.month(), pos-firstday+dayoff)); |
279 | updateCell(temp/7+1, temp%7); // Update the previously selected cell | 279 | updateCell(temp/7+1, temp%7); // Update the previously selected cell |
280 | updateCell(pos/7+1, pos%7); // Update the selected cell | 280 | updateCell(pos/7+1, pos%7); // Update the selected cell |
281 | assert(QDate(date.year(), date.month(), pos-firstday+dayoff).isValid()); | 281 | assert(QDate(date.year(), date.month(), pos-firstday+dayoff).isValid()); |
282 | 282 | ||
283 | 283 | ||
284 | } | 284 | } |
285 | 285 | ||
286 | void | 286 | void |
287 | KDateTable::viewportResizeEvent(QResizeEvent * e) | 287 | KDateTable::viewportResizeEvent(QResizeEvent * e) |
288 | { | 288 | { |
289 | QGridView::viewportResizeEvent(e); | 289 | QGridView::viewportResizeEvent(e); |
290 | 290 | ||
291 | setCellWidth(viewport()->width()/7); | 291 | setCellWidth(viewport()->width()/7); |
292 | setCellHeight(viewport()->height()/7); | 292 | setCellHeight(viewport()->height()/7); |
293 | } | 293 | } |
294 | 294 | ||
295 | void | 295 | void |
296 | KDateTable::setFontSize(int size) | 296 | KDateTable::setFontSize(int size) |
297 | { | 297 | { |
298 | int count; | 298 | int count; |
299 | QRect rect; | 299 | QRect rect; |
300 | // ----- store rectangles: | 300 | // ----- store rectangles: |
301 | fontsize=size; | 301 | fontsize=size; |
302 | QFont _font = font(); | 302 | QFont _font = font(); |
303 | _font.setPointSize(fontsize); | 303 | _font.setPointSize(fontsize); |
304 | setFont( _font ); | 304 | setFont( _font ); |
305 | _font.setBold( true ); | 305 | _font.setBold( true ); |
306 | QFontMetrics metrics(_font); | 306 | QFontMetrics metrics(_font); |
307 | 307 | ||
308 | // ----- find largest day name: | 308 | // ----- find largest day name: |
309 | maxCell.setWidth(0); | 309 | maxCell.setWidth(0); |
310 | maxCell.setHeight(0); | 310 | maxCell.setHeight(0); |
311 | for(count=0; count<7; ++count) | 311 | for(count=0; count<7; ++count) |
312 | { | 312 | { |
313 | rect=metrics.boundingRect(KGlobal::locale()->weekDayName(count+1, true)); | 313 | rect=metrics.boundingRect(KGlobal::locale()->weekDayName(count+1, true)); |
314 | maxCell.setWidth(QMAX(maxCell.width(), rect.width())); | 314 | maxCell.setWidth(QMAX(maxCell.width(), rect.width())); |
315 | maxCell.setHeight(QMAX(maxCell.height(), rect.height())); | 315 | maxCell.setHeight(QMAX(maxCell.height(), rect.height())); |
316 | } | 316 | } |
317 | // ----- compare with a real wide number and add some space: | 317 | // ----- compare with a real wide number and add some space: |
318 | rect=metrics.boundingRect(QString::fromLatin1("88")); | 318 | rect=metrics.boundingRect(QString::fromLatin1("88")); |
319 | maxCell.setWidth(QMAX(maxCell.width()+2, rect.width())); | 319 | maxCell.setWidth(QMAX(maxCell.width()+2, rect.width())); |
320 | #ifdef DESKTOP_VERSION | 320 | #ifdef DESKTOP_VERSION |
321 | maxCell.setHeight(QMAX(maxCell.height()+8, rect.height())); | 321 | maxCell.setHeight(QMAX(maxCell.height()+8, rect.height())); |
322 | #else | 322 | #else |
323 | maxCell.setHeight(QMAX(maxCell.height()+4, rect.height())); | 323 | maxCell.setHeight(QMAX(maxCell.height()+4, rect.height())); |
324 | #endif | 324 | #endif |
325 | if ( maxCell.width() * 1000 / maxCell.height() > 1900 ) { | 325 | if ( maxCell.width() * 1000 / maxCell.height() > 1900 ) { |
326 | maxCell.setHeight(maxCell.width() * 1000 / 1900 ); | 326 | maxCell.setHeight(maxCell.width() * 1000 / 1900 ); |
327 | qDebug("setmax "); | 327 | //qDebug("setmax "); |
328 | } | 328 | } |
329 | } | 329 | } |
330 | 330 | ||
331 | void | 331 | void |
332 | KDateTable::contentsMousePressEvent(QMouseEvent *e) | 332 | KDateTable::contentsMousePressEvent(QMouseEvent *e) |
333 | { | 333 | { |
334 | if(e->type()!=QEvent::MouseButtonPress) | 334 | if(e->type()!=QEvent::MouseButtonPress) |
335 | { // the KDatePicker only reacts on mouse press events: | 335 | { // the KDatePicker only reacts on mouse press events: |
336 | return; | 336 | return; |
337 | } | 337 | } |
338 | if(!isEnabled()) | 338 | if(!isEnabled()) |
339 | { | 339 | { |
340 | KNotifyClient::beep(); | 340 | KNotifyClient::beep(); |
341 | return; | 341 | return; |
342 | } | 342 | } |
343 | 343 | ||
344 | int dayoff = KGlobal::locale()->weekStartsMonday() ? 1 : 0; | 344 | int dayoff = KGlobal::locale()->weekStartsMonday() ? 1 : 0; |
345 | // ----- | 345 | // ----- |
346 | int row, col, pos, temp; | 346 | int row, col, pos, temp; |
347 | QPoint mouseCoord; | 347 | QPoint mouseCoord; |
348 | // ----- | 348 | // ----- |
349 | mouseCoord = e->pos(); | 349 | mouseCoord = e->pos(); |
350 | row=rowAt(mouseCoord.y()); | 350 | row=rowAt(mouseCoord.y()); |
351 | col=columnAt(mouseCoord.x()); | 351 | col=columnAt(mouseCoord.x()); |
352 | if(row<0 || col<0) | 352 | if(row<0 || col<0) |
353 | { // the user clicked on the frame of the table | 353 | { // the user clicked on the frame of the table |
354 | return; | 354 | return; |
355 | } | 355 | } |
356 | pos=7*(row-1)+col+1; | 356 | pos=7*(row-1)+col+1; |
357 | #if 0 | 357 | #if 0 |
358 | if(pos+dayoff<=firstday) | 358 | if(pos+dayoff<=firstday) |
359 | { // this day is in the previous month | 359 | { // this day is in the previous month |
360 | KNotifyClient::beep(); | 360 | KNotifyClient::beep(); |
361 | return; | 361 | return; |
362 | } | 362 | } |
363 | if(firstday+numdays<pos+dayoff) | 363 | if(firstday+numdays<pos+dayoff) |
364 | { // this date is in the next month | 364 | { // this date is in the next month |
365 | KNotifyClient::beep(); | 365 | KNotifyClient::beep(); |
366 | return; | 366 | return; |
367 | } | 367 | } |
368 | #endif | 368 | #endif |
369 | temp=firstday+date.day()-dayoff-1; | 369 | temp=firstday+date.day()-dayoff-1; |
370 | QDate da = QDate(date.year(), date.month(),1); | 370 | QDate da = QDate(date.year(), date.month(),1); |
371 | setDate(da.addDays( pos-firstday+dayoff-1)); | 371 | setDate(da.addDays( pos-firstday+dayoff-1)); |
372 | updateCell(temp/7+1, temp%7); // Update the previously selected cell | 372 | updateCell(temp/7+1, temp%7); // Update the previously selected cell |
373 | updateCell(row, col); // Update the selected cell | 373 | updateCell(row, col); // Update the selected cell |
374 | // assert(QDate(date.year(), date.month(), pos-firstday+dayoff).isValid()); | 374 | // assert(QDate(date.year(), date.month(), pos-firstday+dayoff).isValid()); |
375 | emit(tableClicked()); | 375 | emit(tableClicked()); |
376 | } | 376 | } |
377 | 377 | ||
378 | bool | 378 | bool |
379 | KDateTable::setDate(const QDate& date_) | 379 | KDateTable::setDate(const QDate& date_) |
380 | { | 380 | { |
381 | bool changed=false; | 381 | bool changed=false; |
382 | QDate temp; | 382 | QDate temp; |
383 | mMarkCurrent = false; | 383 | mMarkCurrent = false; |
384 | // ----- | 384 | // ----- |
385 | if(!date_.isValid()) | 385 | if(!date_.isValid()) |
386 | { | 386 | { |
387 | kdDebug() << "KDateTable::setDate: refusing to set invalid date." << endl; | 387 | kdDebug() << "KDateTable::setDate: refusing to set invalid date." << endl; |
388 | return false; | 388 | return false; |
389 | } | 389 | } |
390 | if(date!=date_) | 390 | if(date!=date_) |
391 | { | 391 | { |
392 | date=date_; | 392 | date=date_; |
393 | changed=true; | 393 | changed=true; |
394 | } | 394 | } |
395 | mMarkCurrent = ( date.month() == QDate::currentDate().month() && date.year() == QDate::currentDate().year() ); | 395 | mMarkCurrent = ( date.month() == QDate::currentDate().month() && date.year() == QDate::currentDate().year() ); |
396 | temp.setYMD(date.year(), date.month(), 1); | 396 | temp.setYMD(date.year(), date.month(), 1); |
397 | firstday=temp.dayOfWeek(); | 397 | firstday=temp.dayOfWeek(); |
398 | if(firstday==1) firstday=8; | 398 | if(firstday==1) firstday=8; |
399 | numdays=date.daysInMonth(); | 399 | numdays=date.daysInMonth(); |
400 | if(date.month()==1) | 400 | if(date.month()==1) |
401 | { // set to december of previous year | 401 | { // set to december of previous year |
402 | temp.setYMD(date.year()-1, 12, 1); | 402 | temp.setYMD(date.year()-1, 12, 1); |
403 | } else { // set to previous month | 403 | } else { // set to previous month |
404 | temp.setYMD(date.year(), date.month()-1, 1); | 404 | temp.setYMD(date.year(), date.month()-1, 1); |
405 | } | 405 | } |
406 | numDaysPrevMonth=temp.daysInMonth(); | 406 | numDaysPrevMonth=temp.daysInMonth(); |
407 | if(changed) | 407 | if(changed) |
408 | { | 408 | { |
409 | repaintContents(false); | 409 | repaintContents(false); |
410 | } | 410 | } |
411 | emit(dateChanged(date)); | 411 | emit(dateChanged(date)); |
412 | return true; | 412 | return true; |
413 | } | 413 | } |
414 | 414 | ||
415 | const QDate& | 415 | const QDate& |
416 | KDateTable::getDate() const | 416 | KDateTable::getDate() const |
417 | { | 417 | { |
418 | return date; | 418 | return date; |
419 | } | 419 | } |
420 | 420 | ||
421 | void KDateTable::focusInEvent( QFocusEvent *e ) | 421 | void KDateTable::focusInEvent( QFocusEvent *e ) |
422 | { | 422 | { |
423 | repaintContents(false); | 423 | repaintContents(false); |
424 | QGridView::focusInEvent( e ); | 424 | QGridView::focusInEvent( e ); |
425 | } | 425 | } |
426 | 426 | ||
427 | void KDateTable::focusOutEvent( QFocusEvent *e ) | 427 | void KDateTable::focusOutEvent( QFocusEvent *e ) |
428 | { | 428 | { |
429 | repaintContents(false); | 429 | repaintContents(false); |
430 | QGridView::focusOutEvent( e ); | 430 | QGridView::focusOutEvent( e ); |
431 | } | 431 | } |
432 | 432 | ||
433 | QSize | 433 | QSize |
434 | KDateTable::sizeHint() const | 434 | KDateTable::sizeHint() const |
435 | { | 435 | { |
436 | if(maxCell.height()>0 && maxCell.width()>0) | 436 | if(maxCell.height()>0 && maxCell.width()>0) |
437 | { | 437 | { |
438 | return QSize((maxCell.width()+2)*numCols()+2*frameWidth(), | 438 | return QSize((maxCell.width()+2)*numCols()+2*frameWidth(), |
439 | (maxCell.height()+4)*numRows()+2*frameWidth()); | 439 | (maxCell.height()+4)*numRows()+2*frameWidth()); |
440 | } else { | 440 | } else { |
441 | return QSize(-1, -1); | 441 | return QSize(-1, -1); |
442 | } | 442 | } |
443 | } | 443 | } |
444 | 444 | ||
445 | KDateInternalMonthPicker::KDateInternalMonthPicker | 445 | KDateInternalMonthPicker::KDateInternalMonthPicker |
446 | (QWidget* parent, const char* name) | 446 | (QWidget* parent, const char* name) |
447 | : QGridView(parent, name), | 447 | : QGridView(parent, name), |
448 | result(0) // invalid | 448 | result(0) // invalid |
449 | { | 449 | { |
450 | QRect rect; | 450 | QRect rect; |
451 | QFont font; | 451 | QFont font; |
452 | // ----- | 452 | // ----- |
453 | activeCol = -1; | 453 | activeCol = -1; |
454 | activeRow = -1; | 454 | activeRow = -1; |
455 | font=KGlobalSettings::generalFont(); | 455 | font=KGlobalSettings::generalFont(); |
456 | int fontsize = 10; | 456 | int fontsize = 10; |
457 | int add = 2; | 457 | int add = 2; |
458 | if ( QApplication::desktop()->width() >= 480 && QApplication::desktop()->width() <= 640 ) | 458 | if ( QApplication::desktop()->width() >= 480 && QApplication::desktop()->width() <= 640 ) |
459 | add += 8; | 459 | add += 8; |
460 | if ( QApplication::desktop()->width() > 640 ) | 460 | if ( QApplication::desktop()->width() > 640 ) |
461 | add += 6; | 461 | add += 6; |
462 | font.setPointSize(fontsize+add); | 462 | font.setPointSize(fontsize+add); |
463 | setFont(font); | 463 | setFont(font); |
464 | setHScrollBarMode(AlwaysOff); | 464 | setHScrollBarMode(AlwaysOff); |
465 | setVScrollBarMode(AlwaysOff); | 465 | setVScrollBarMode(AlwaysOff); |
466 | setFrameStyle(QFrame::NoFrame); | 466 | setFrameStyle(QFrame::NoFrame); |
467 | setNumRows(4); | 467 | setNumRows(4); |
468 | setNumCols(3); | 468 | setNumCols(3); |
469 | // enable to find drawing failures: | 469 | // enable to find drawing failures: |
470 | // setTableFlags(Tbl_clipCellPainting); | 470 | // setTableFlags(Tbl_clipCellPainting); |
471 | #if 0 | 471 | #if 0 |
472 | viewport()->setEraseColor(lightGray); // for consistency with the datepicker | 472 | viewport()->setEraseColor(lightGray); // for consistency with the datepicker |
473 | #endif | 473 | #endif |
474 | // ----- find the preferred size | 474 | // ----- find the preferred size |
475 | // (this is slow, possibly, but unfortunatly it is needed here): | 475 | // (this is slow, possibly, but unfortunatly it is needed here): |
476 | QFontMetrics metrics(font); | 476 | QFontMetrics metrics(font); |
477 | for(int i=1; i <= 12; ++i) | 477 | for(int i=1; i <= 12; ++i) |
478 | { | 478 | { |
479 | rect=metrics.boundingRect(KGlobal::locale()->monthName(i, false)); | 479 | rect=metrics.boundingRect(KGlobal::locale()->monthName(i, false)); |
480 | if(max.width()<rect.width()) max.setWidth(rect.width()); | 480 | if(max.width()<rect.width()) max.setWidth(rect.width()); |
481 | if(max.height()<rect.height()) max.setHeight(rect.height()); | 481 | if(max.height()<rect.height()) max.setHeight(rect.height()); |
482 | } | 482 | } |
483 | 483 | ||
484 | } | 484 | } |
485 | 485 | ||
486 | QSize | 486 | QSize |
487 | KDateInternalMonthPicker::sizeHint() const | 487 | KDateInternalMonthPicker::sizeHint() const |
488 | { | 488 | { |
489 | return QSize((max.width()+6)*numCols()+2*frameWidth(), | 489 | return QSize((max.width()+6)*numCols()+2*frameWidth(), |
490 | (max.height()+6)*numRows()+2*frameWidth()); | 490 | (max.height()+6)*numRows()+2*frameWidth()); |
491 | } | 491 | } |
492 | 492 | ||
493 | int | 493 | int |
494 | KDateInternalMonthPicker::getResult() const | 494 | KDateInternalMonthPicker::getResult() const |
495 | { | 495 | { |
496 | return result; | 496 | return result; |
497 | } | 497 | } |
498 | 498 | ||
499 | void | 499 | void |
500 | KDateInternalMonthPicker::setupPainter(QPainter *p) | 500 | KDateInternalMonthPicker::setupPainter(QPainter *p) |
501 | { | 501 | { |
502 | p->setPen(black); | 502 | p->setPen(black); |
503 | } | 503 | } |
504 | 504 | ||
505 | void | 505 | void |
506 | KDateInternalMonthPicker::viewportResizeEvent(QResizeEvent*) | 506 | KDateInternalMonthPicker::viewportResizeEvent(QResizeEvent*) |
507 | { | 507 | { |
508 | setCellWidth(width()/3); | 508 | setCellWidth(width()/3); |
509 | setCellHeight(height()/4); | 509 | setCellHeight(height()/4); |
510 | } | 510 | } |
511 | 511 | ||
512 | void | 512 | void |
513 | KDateInternalMonthPicker::paintCell(QPainter* painter, int row, int col) | 513 | KDateInternalMonthPicker::paintCell(QPainter* painter, int row, int col) |
514 | { | 514 | { |
515 | int index; | 515 | int index; |
516 | QString text; | 516 | QString text; |
517 | // ----- find the number of the cell: | 517 | // ----- find the number of the cell: |
518 | index=3*row+col+1; | 518 | index=3*row+col+1; |
519 | text=KGlobal::locale()->monthName(index, false); | 519 | text=KGlobal::locale()->monthName(index, false); |
520 | painter->drawText(0, 0, cellWidth(), cellHeight(), AlignCenter, text); | 520 | painter->drawText(0, 0, cellWidth(), cellHeight(), AlignCenter, text); |
521 | if ( activeCol == col && activeRow == row ) | 521 | if ( activeCol == col && activeRow == row ) |
522 | painter->drawRect( 0, 0, cellWidth(), cellHeight() ); | 522 | painter->drawRect( 0, 0, cellWidth(), cellHeight() ); |
523 | } | 523 | } |
524 | 524 | ||
525 | void | 525 | void |
526 | KDateInternalMonthPicker::contentsMousePressEvent(QMouseEvent *e) | 526 | KDateInternalMonthPicker::contentsMousePressEvent(QMouseEvent *e) |
527 | { | 527 | { |
528 | if(!isEnabled() || e->button() != LeftButton) | 528 | if(!isEnabled() || e->button() != LeftButton) |
529 | { | 529 | { |
530 | KNotifyClient::beep(); | 530 | KNotifyClient::beep(); |
531 | return; | 531 | return; |
532 | } | 532 | } |
533 | // ----- | 533 | // ----- |
534 | int row, col; | 534 | int row, col; |
535 | QPoint mouseCoord; | 535 | QPoint mouseCoord; |
536 | // ----- | 536 | // ----- |
537 | mouseCoord = e->pos(); | 537 | mouseCoord = e->pos(); |
538 | row=rowAt(mouseCoord.y()); | 538 | row=rowAt(mouseCoord.y()); |
539 | col=columnAt(mouseCoord.x()); | 539 | col=columnAt(mouseCoord.x()); |
540 | 540 | ||
541 | if(row<0 || col<0) | 541 | if(row<0 || col<0) |
542 | { // the user clicked on the frame of the table | 542 | { // the user clicked on the frame of the table |
543 | activeCol = -1; | 543 | activeCol = -1; |
544 | activeRow = -1; | 544 | activeRow = -1; |
545 | } else { | 545 | } else { |
546 | activeCol = col; | 546 | activeCol = col; |
547 | activeRow = row; | 547 | activeRow = row; |
548 | updateCell( row, col /*, false */ ); | 548 | updateCell( row, col /*, false */ ); |
549 | } | 549 | } |
550 | } | 550 | } |
551 | 551 | ||
552 | void | 552 | void |
553 | KDateInternalMonthPicker::contentsMouseMoveEvent(QMouseEvent *e) | 553 | KDateInternalMonthPicker::contentsMouseMoveEvent(QMouseEvent *e) |
554 | { | 554 | { |
555 | if (e->state() & LeftButton) | 555 | if (e->state() & LeftButton) |
556 | { | 556 | { |
557 | int row, col; | 557 | int row, col; |
558 | QPoint mouseCoord; | 558 | QPoint mouseCoord; |
559 | // ----- | 559 | // ----- |
560 | mouseCoord = e->pos(); | 560 | mouseCoord = e->pos(); |
561 | row=rowAt(mouseCoord.y()); | 561 | row=rowAt(mouseCoord.y()); |
562 | col=columnAt(mouseCoord.x()); | 562 | col=columnAt(mouseCoord.x()); |
563 | int tmpRow = -1, tmpCol = -1; | 563 | int tmpRow = -1, tmpCol = -1; |
564 | if(row<0 || col<0) | 564 | if(row<0 || col<0) |
565 | { // the user clicked on the frame of the table | 565 | { // the user clicked on the frame of the table |
566 | if ( activeCol > -1 ) | 566 | if ( activeCol > -1 ) |
567 | { | 567 | { |
568 | tmpRow = activeRow; | 568 | tmpRow = activeRow; |
569 | tmpCol = activeCol; | 569 | tmpCol = activeCol; |
570 | } | 570 | } |
571 | activeCol = -1; | 571 | activeCol = -1; |
572 | activeRow = -1; | 572 | activeRow = -1; |
573 | } else { | 573 | } else { |
574 | bool differentCell = (activeRow != row || activeCol != col); | 574 | bool differentCell = (activeRow != row || activeCol != col); |
575 | if ( activeCol > -1 && differentCell) | 575 | if ( activeCol > -1 && differentCell) |
576 | { | 576 | { |
577 | tmpRow = activeRow; | 577 | tmpRow = activeRow; |
578 | tmpCol = activeCol; | 578 | tmpCol = activeCol; |
579 | } | 579 | } |
580 | if ( differentCell) | 580 | if ( differentCell) |
581 | { | 581 | { |
582 | activeRow = row; | 582 | activeRow = row; |
583 | activeCol = col; | 583 | activeCol = col; |
584 | updateCell( row, col /*, false */ ); // mark the new active cell | 584 | updateCell( row, col /*, false */ ); // mark the new active cell |
585 | } | 585 | } |
586 | } | 586 | } |
587 | if ( tmpRow > -1 ) // repaint the former active cell | 587 | if ( tmpRow > -1 ) // repaint the former active cell |
588 | updateCell( tmpRow, tmpCol /*, true */ ); | 588 | updateCell( tmpRow, tmpCol /*, true */ ); |
589 | } | 589 | } |
590 | } | 590 | } |
591 | 591 | ||
592 | void | 592 | void |
593 | KDateInternalMonthPicker::contentsMouseReleaseEvent(QMouseEvent *e) | 593 | KDateInternalMonthPicker::contentsMouseReleaseEvent(QMouseEvent *e) |
594 | { | 594 | { |
595 | if(!isEnabled()) | 595 | if(!isEnabled()) |
596 | { | 596 | { |
597 | return; | 597 | return; |
598 | } | 598 | } |
599 | // ----- | 599 | // ----- |
600 | int row, col, pos; | 600 | int row, col, pos; |
601 | QPoint mouseCoord; | 601 | QPoint mouseCoord; |
602 | // ----- | 602 | // ----- |
603 | mouseCoord = e->pos(); | 603 | mouseCoord = e->pos(); |
604 | row=rowAt(mouseCoord.y()); | 604 | row=rowAt(mouseCoord.y()); |
605 | col=columnAt(mouseCoord.x()); | 605 | col=columnAt(mouseCoord.x()); |
606 | if(row<0 || col<0) | 606 | if(row<0 || col<0) |
607 | { // the user clicked on the frame of the table | 607 | { // the user clicked on the frame of the table |
608 | emit(closeMe(0)); | 608 | emit(closeMe(0)); |
609 | } | 609 | } |
610 | pos=3*row+col+1; | 610 | pos=3*row+col+1; |
611 | result=pos; | 611 | result=pos; |
612 | emit(closeMe(1)); | 612 | emit(closeMe(1)); |
613 | } | 613 | } |
614 | 614 | ||
615 | 615 | ||
616 | 616 | ||
617 | KDateInternalYearSelector::KDateInternalYearSelector | 617 | KDateInternalYearSelector::KDateInternalYearSelector |
618 | (int fontsize, QWidget* parent, const char* name) | 618 | (int fontsize, QWidget* parent, const char* name) |
619 | : QLineEdit(parent, name), | 619 | : QLineEdit(parent, name), |
620 | val(new QIntValidator(this)), | 620 | val(new QIntValidator(this)), |
621 | result(0) | 621 | result(0) |
622 | { | 622 | { |
623 | QFont font; | 623 | QFont font; |
624 | // ----- | 624 | // ----- |
625 | font=KGlobalSettings::generalFont(); | 625 | font=KGlobalSettings::generalFont(); |
626 | font.setPointSize(fontsize); | 626 | font.setPointSize(fontsize); |
627 | setFont(font); | 627 | setFont(font); |
628 | #if 0 | 628 | #if 0 |
629 | setFrameStyle(QFrame::NoFrame); | 629 | setFrameStyle(QFrame::NoFrame); |
630 | #endif | 630 | #endif |
631 | // we have to respect the limits of QDate here, I fear: | 631 | // we have to respect the limits of QDate here, I fear: |
632 | val->setRange(0, 8000); | 632 | val->setRange(0, 8000); |
633 | setValidator(val); | 633 | setValidator(val); |
634 | connect(this, SIGNAL(returnPressed()), SLOT(yearEnteredSlot())); | 634 | connect(this, SIGNAL(returnPressed()), SLOT(yearEnteredSlot())); |
635 | } | 635 | } |
636 | 636 | ||
637 | void | 637 | void |
638 | KDateInternalYearSelector::yearEnteredSlot() | 638 | KDateInternalYearSelector::yearEnteredSlot() |
639 | { | 639 | { |
640 | bool ok; | 640 | bool ok; |
641 | int year; | 641 | int year; |
642 | QDate date; | 642 | QDate date; |
643 | // ----- check if this is a valid year: | 643 | // ----- check if this is a valid year: |
644 | year=text().toInt(&ok); | 644 | year=text().toInt(&ok); |
645 | if(!ok) | 645 | if(!ok) |
646 | { | 646 | { |
647 | KNotifyClient::beep(); | 647 | KNotifyClient::beep(); |
648 | return; | 648 | return; |
649 | } | 649 | } |
650 | date.setYMD(year, 1, 1); | 650 | date.setYMD(year, 1, 1); |
651 | if(!date.isValid()) | 651 | if(!date.isValid()) |
652 | { | 652 | { |
653 | KNotifyClient::beep(); | 653 | KNotifyClient::beep(); |
654 | return; | 654 | return; |
655 | } | 655 | } |
656 | result=year; | 656 | result=year; |
657 | emit(closeMe(1)); | 657 | emit(closeMe(1)); |
658 | } | 658 | } |
659 | 659 | ||
660 | int | 660 | int |
661 | KDateInternalYearSelector::getYear() | 661 | KDateInternalYearSelector::getYear() |
662 | { | 662 | { |
663 | return result; | 663 | return result; |
664 | } | 664 | } |
665 | 665 | ||
666 | void | 666 | void |
667 | KDateInternalYearSelector::setYear(int year) | 667 | KDateInternalYearSelector::setYear(int year) |
668 | { | 668 | { |
669 | QString temp; | 669 | QString temp; |
670 | // ----- | 670 | // ----- |
671 | temp.setNum(year); | 671 | temp.setNum(year); |
672 | setText(temp); | 672 | setText(temp); |
673 | } | 673 | } |
674 | 674 | ||
675 | KPopupFrame::KPopupFrame(QWidget* parent, const char* name) | 675 | KPopupFrame::KPopupFrame(QWidget* parent, const char* name) |
676 | : QFrame(parent, name, WType_Popup), | 676 | : QFrame(parent, name, WType_Popup), |
677 | result(0), // rejected | 677 | result(0), // rejected |
678 | main(0) | 678 | main(0) |
679 | { | 679 | { |
680 | setFrameStyle(QFrame::Box|QFrame::Raised); | 680 | setFrameStyle(QFrame::Box|QFrame::Raised); |
681 | setMidLineWidth(2); | 681 | setMidLineWidth(2); |
682 | } | 682 | } |
683 | 683 | ||
684 | void | 684 | void |
685 | KPopupFrame::keyPressEvent(QKeyEvent* e) | 685 | KPopupFrame::keyPressEvent(QKeyEvent* e) |
686 | { | 686 | { |
687 | if(e->key()==Key_Escape) | 687 | if(e->key()==Key_Escape) |
688 | { | 688 | { |
689 | result=0; // rejected | 689 | result=0; // rejected |
690 | qApp->exit_loop(); | 690 | qApp->exit_loop(); |
691 | } | 691 | } |
692 | } | 692 | } |
693 | 693 | ||
694 | void | 694 | void |
695 | KPopupFrame::close(int r) | 695 | KPopupFrame::close(int r) |
696 | { | 696 | { |
697 | result=r; | 697 | result=r; |
698 | qApp->exit_loop(); | 698 | qApp->exit_loop(); |
699 | } | 699 | } |
700 | 700 | ||
701 | void | 701 | void |
702 | KPopupFrame::setMainWidget(QWidget* m) | 702 | KPopupFrame::setMainWidget(QWidget* m) |
703 | { | 703 | { |
704 | main=m; | 704 | main=m; |
705 | if(main!=0) | 705 | if(main!=0) |
706 | { | 706 | { |
707 | resize(main->width()+2*frameWidth(), main->height()+2*frameWidth()); | 707 | resize(main->width()+2*frameWidth(), main->height()+2*frameWidth()); |
708 | } | 708 | } |
709 | } | 709 | } |
710 | 710 | ||
711 | void | 711 | void |
712 | KPopupFrame::resizeEvent(QResizeEvent*) | 712 | KPopupFrame::resizeEvent(QResizeEvent*) |
713 | { | 713 | { |
714 | if(main!=0) | 714 | if(main!=0) |
715 | { | 715 | { |
716 | main->setGeometry(frameWidth(), frameWidth(), | 716 | main->setGeometry(frameWidth(), frameWidth(), |
717 | width()-2*frameWidth(), height()-2*frameWidth()); | 717 | width()-2*frameWidth(), height()-2*frameWidth()); |
718 | } | 718 | } |
719 | } | 719 | } |
720 | 720 | ||
721 | void | 721 | void |
722 | KPopupFrame::popup(const QPoint &pos) | 722 | KPopupFrame::popup(const QPoint &pos) |
723 | { | 723 | { |
724 | // Make sure the whole popup is visible. | 724 | // Make sure the whole popup is visible. |
725 | QRect d = QApplication::desktop()->frameGeometry(); | 725 | QRect d = QApplication::desktop()->frameGeometry(); |
726 | int x = pos.x(); | 726 | int x = pos.x(); |
727 | int y = pos.y(); | 727 | int y = pos.y(); |
728 | int w = width(); | 728 | int w = width(); |
729 | int h = height(); | 729 | int h = height(); |
730 | if (x+w > d.x()+d.width()) | 730 | if (x+w > d.x()+d.width()) |
731 | x = d.width() - w; | 731 | x = d.width() - w; |
732 | if (y+h > d.y()+d.height()) | 732 | if (y+h > d.y()+d.height()) |
733 | y = d.height() - h; | 733 | y = d.height() - h; |
734 | if (x < d.x()) | 734 | if (x < d.x()) |
735 | x = 0; | 735 | x = 0; |
736 | if (y < d.y()) | 736 | if (y < d.y()) |
737 | y = 0; | 737 | y = 0; |
738 | 738 | ||
739 | // Pop the thingy up. | 739 | // Pop the thingy up. |
740 | move(x, y); | 740 | move(x, y); |
741 | show(); | 741 | show(); |
742 | } | 742 | } |
743 | 743 | ||
744 | int | 744 | int |
745 | KPopupFrame::exec(QPoint pos) | 745 | KPopupFrame::exec(QPoint pos) |
746 | { | 746 | { |
747 | popup(pos); | 747 | popup(pos); |
748 | repaint(); | 748 | repaint(); |
749 | qApp->enter_loop(); | 749 | qApp->enter_loop(); |
750 | hide(); | 750 | hide(); |
751 | return result; | 751 | return result; |
752 | } | 752 | } |
753 | 753 | ||
754 | int | 754 | int |
755 | KPopupFrame::exec(int x, int y) | 755 | KPopupFrame::exec(int x, int y) |
756 | { | 756 | { |
757 | return exec(QPoint(x, y)); | 757 | return exec(QPoint(x, y)); |
758 | } | 758 | } |
759 | 759 | ||
760 | void KPopupFrame::virtual_hook( int, void* ) | 760 | void KPopupFrame::virtual_hook( int, void* ) |
761 | { /*BASE::virtual_hook( id, data );*/ } | 761 | { /*BASE::virtual_hook( id, data );*/ } |
762 | 762 | ||
763 | void KDateTable::virtual_hook( int, void* ) | 763 | void KDateTable::virtual_hook( int, void* ) |
764 | { /*BASE::virtual_hook( id, data );*/ } | 764 | { /*BASE::virtual_hook( id, data );*/ } |
765 | 765 | ||
766 | //#include "kdatetbl.moc" | 766 | //#include "kdatetbl.moc" |
767 | 767 | ||
768 | 768 | ||
769 | KDateInternalWeekPicker::KDateInternalWeekPicker | 769 | KDateInternalWeekPicker::KDateInternalWeekPicker |
770 | (QWidget* parent, const char* name) | 770 | (QWidget* parent, const char* name) |
771 | : QGridView(parent, name), | 771 | : QGridView(parent, name), |
772 | result(0) // invalid | 772 | result(0) // invalid |
773 | { | 773 | { |
774 | QRect rect; | 774 | QRect rect; |
775 | QFont font; | 775 | QFont font; |
776 | // ----- | 776 | // ----- |
777 | activeCol = -1; | 777 | activeCol = -1; |
778 | activeRow = -1; | 778 | activeRow = -1; |
779 | font=KGlobalSettings::generalFont(); | 779 | font=KGlobalSettings::generalFont(); |
780 | int fontsize = 10; | 780 | int fontsize = 10; |
781 | int add = 2; | 781 | int add = 2; |
782 | if ( QApplication::desktop()->width() >= 480 && QApplication::desktop()->width() <= 640 ) | 782 | if ( QApplication::desktop()->width() >= 480 && QApplication::desktop()->width() <= 640 ) |
783 | add += 6; | 783 | add += 6; |
784 | font.setPointSize(fontsize+add); | 784 | font.setPointSize(fontsize+add); |
785 | setFont(font); | 785 | setFont(font); |
786 | setHScrollBarMode(AlwaysOff); | 786 | setHScrollBarMode(AlwaysOff); |
787 | setVScrollBarMode(AlwaysOff); | 787 | setVScrollBarMode(AlwaysOff); |
788 | setFrameStyle(QFrame::NoFrame); | 788 | setFrameStyle(QFrame::NoFrame); |
789 | setNumRows(13); | 789 | setNumRows(13); |
790 | setNumCols(4); | 790 | setNumCols(4); |
791 | // enable to find drawing failures: | 791 | // enable to find drawing failures: |
792 | // setTableFlags(Tbl_clipCellPainting); | 792 | // setTableFlags(Tbl_clipCellPainting); |
793 | #if 0 | 793 | #if 0 |
794 | viewport()->setEraseColor(lightGray); // for consistency with the datepicker | 794 | viewport()->setEraseColor(lightGray); // for consistency with the datepicker |
795 | #endif | 795 | #endif |
796 | // ----- find the preferred size | 796 | // ----- find the preferred size |
797 | // (this is slow, possibly, but unfortunatly it is needed here): | 797 | // (this is slow, possibly, but unfortunatly it is needed here): |
798 | QFontMetrics metrics(font); | 798 | QFontMetrics metrics(font); |
799 | for(int i=1; i <= 52; ++i) | 799 | for(int i=1; i <= 52; ++i) |
800 | { | 800 | { |
801 | rect=metrics.boundingRect(QString::number( i )); | 801 | rect=metrics.boundingRect(QString::number( i )); |
802 | if(max.width()<rect.width()) max.setWidth(rect.width()); | 802 | if(max.width()<rect.width()) max.setWidth(rect.width()); |
803 | if(max.height()<rect.height()) max.setHeight(rect.height()); | 803 | if(max.height()<rect.height()) max.setHeight(rect.height()); |
804 | } | 804 | } |
805 | if ( QApplication::desktop()->width() > 640 ) { | 805 | if ( QApplication::desktop()->width() > 640 ) { |
806 | 806 | ||
807 | max.setWidth(max.width()+6); | 807 | max.setWidth(max.width()+6); |
808 | max.setHeight(max.height()+8); | 808 | max.setHeight(max.height()+8); |
809 | } | 809 | } |
810 | } | 810 | } |
811 | 811 | ||
812 | QSize | 812 | QSize |
813 | KDateInternalWeekPicker::sizeHint() const | 813 | KDateInternalWeekPicker::sizeHint() const |
814 | { | 814 | { |
815 | return QSize((max.width()+6)*numCols()+2*frameWidth(), | 815 | return QSize((max.width()+6)*numCols()+2*frameWidth(), |
816 | (max.height()+6)*numRows()+2*frameWidth()); | 816 | (max.height()+6)*numRows()+2*frameWidth()); |
817 | } | 817 | } |
818 | 818 | ||
819 | int | 819 | int |
820 | KDateInternalWeekPicker::getResult() const | 820 | KDateInternalWeekPicker::getResult() const |
821 | { | 821 | { |
822 | return result; | 822 | return result; |
823 | } | 823 | } |
824 | 824 | ||
825 | void | 825 | void |
826 | KDateInternalWeekPicker::setupPainter(QPainter *p) | 826 | KDateInternalWeekPicker::setupPainter(QPainter *p) |
827 | { | 827 | { |
828 | p->setPen(black); | 828 | p->setPen(black); |
829 | } | 829 | } |
830 | 830 | ||
831 | void | 831 | void |
832 | KDateInternalWeekPicker::viewportResizeEvent(QResizeEvent*) | 832 | KDateInternalWeekPicker::viewportResizeEvent(QResizeEvent*) |
833 | { | 833 | { |
834 | setCellWidth(width()/4); | 834 | setCellWidth(width()/4); |
835 | setCellHeight(height()/13); | 835 | setCellHeight(height()/13); |
836 | } | 836 | } |
837 | 837 | ||
838 | void | 838 | void |
839 | KDateInternalWeekPicker::paintCell(QPainter* painter, int row, int col) | 839 | KDateInternalWeekPicker::paintCell(QPainter* painter, int row, int col) |
840 | { | 840 | { |
841 | int index; | 841 | int index; |
842 | QString text; | 842 | QString text; |
843 | // ----- find the number of the cell: | 843 | // ----- find the number of the cell: |
844 | index=4*row+col+1; | 844 | index=4*row+col+1; |
845 | text=QString::number( index ); | 845 | text=QString::number( index ); |
846 | painter->drawText(0, 0, cellWidth(), cellHeight(), AlignCenter, text); | 846 | painter->drawText(0, 0, cellWidth(), cellHeight(), AlignCenter, text); |
847 | if ( activeCol == col && activeRow == row ) | 847 | if ( activeCol == col && activeRow == row ) |
848 | painter->drawRect( 0, 0, cellWidth(), cellHeight() ); | 848 | painter->drawRect( 0, 0, cellWidth(), cellHeight() ); |
849 | } | 849 | } |
850 | 850 | ||
851 | void | 851 | void |
852 | KDateInternalWeekPicker::contentsMousePressEvent(QMouseEvent *e) | 852 | KDateInternalWeekPicker::contentsMousePressEvent(QMouseEvent *e) |
853 | { | 853 | { |
854 | if(!isEnabled() || e->button() != LeftButton) | 854 | if(!isEnabled() || e->button() != LeftButton) |
855 | { | 855 | { |
856 | KNotifyClient::beep(); | 856 | KNotifyClient::beep(); |
857 | return; | 857 | return; |
858 | } | 858 | } |
859 | // ----- | 859 | // ----- |
860 | int row, col; | 860 | int row, col; |
861 | QPoint mouseCoord; | 861 | QPoint mouseCoord; |
862 | // ----- | 862 | // ----- |
863 | mouseCoord = e->pos(); | 863 | mouseCoord = e->pos(); |
864 | row=rowAt(mouseCoord.y()); | 864 | row=rowAt(mouseCoord.y()); |
865 | col=columnAt(mouseCoord.x()); | 865 | col=columnAt(mouseCoord.x()); |
866 | 866 | ||
867 | if(row<0 || col<0) | 867 | if(row<0 || col<0) |
868 | { // the user clicked on the frame of the table | 868 | { // the user clicked on the frame of the table |
869 | activeCol = -1; | 869 | activeCol = -1; |
870 | activeRow = -1; | 870 | activeRow = -1; |
871 | } else { | 871 | } else { |
872 | activeCol = col; | 872 | activeCol = col; |
873 | activeRow = row; | 873 | activeRow = row; |
874 | updateCell( row, col /*, false */ ); | 874 | updateCell( row, col /*, false */ ); |
875 | } | 875 | } |
876 | } | 876 | } |
877 | 877 | ||
878 | void | 878 | void |
879 | KDateInternalWeekPicker::contentsMouseMoveEvent(QMouseEvent *e) | 879 | KDateInternalWeekPicker::contentsMouseMoveEvent(QMouseEvent *e) |
880 | { | 880 | { |
881 | if (e->state() & LeftButton) | 881 | if (e->state() & LeftButton) |
882 | { | 882 | { |
883 | int row, col; | 883 | int row, col; |
884 | QPoint mouseCoord; | 884 | QPoint mouseCoord; |
885 | // ----- | 885 | // ----- |
886 | mouseCoord = e->pos(); | 886 | mouseCoord = e->pos(); |
887 | row=rowAt(mouseCoord.y()); | 887 | row=rowAt(mouseCoord.y()); |
888 | col=columnAt(mouseCoord.x()); | 888 | col=columnAt(mouseCoord.x()); |
889 | int tmpRow = -1, tmpCol = -1; | 889 | int tmpRow = -1, tmpCol = -1; |
890 | if(row<0 || col<0) | 890 | if(row<0 || col<0) |
891 | { // the user clicked on the frame of the table | 891 | { // the user clicked on the frame of the table |
892 | if ( activeCol > -1 ) | 892 | if ( activeCol > -1 ) |
893 | { | 893 | { |
894 | tmpRow = activeRow; | 894 | tmpRow = activeRow; |
895 | tmpCol = activeCol; | 895 | tmpCol = activeCol; |
896 | } | 896 | } |
897 | activeCol = -1; | 897 | activeCol = -1; |
898 | activeRow = -1; | 898 | activeRow = -1; |
899 | } else { | 899 | } else { |
900 | bool differentCell = (activeRow != row || activeCol != col); | 900 | bool differentCell = (activeRow != row || activeCol != col); |
901 | if ( activeCol > -1 && differentCell) | 901 | if ( activeCol > -1 && differentCell) |
902 | { | 902 | { |
903 | tmpRow = activeRow; | 903 | tmpRow = activeRow; |
904 | tmpCol = activeCol; | 904 | tmpCol = activeCol; |
905 | } | 905 | } |
906 | if ( differentCell) | 906 | if ( differentCell) |
907 | { | 907 | { |
908 | activeRow = row; | 908 | activeRow = row; |
909 | activeCol = col; | 909 | activeCol = col; |
910 | updateCell( row, col /*, false */ ); // mark the new active cell | 910 | updateCell( row, col /*, false */ ); // mark the new active cell |
911 | } | 911 | } |
912 | } | 912 | } |
913 | if ( tmpRow > -1 ) // repaint the former active cell | 913 | if ( tmpRow > -1 ) // repaint the former active cell |
914 | updateCell( tmpRow, tmpCol /*, true */ ); | 914 | updateCell( tmpRow, tmpCol /*, true */ ); |
915 | } | 915 | } |
916 | } | 916 | } |
917 | 917 | ||
918 | void | 918 | void |
919 | KDateInternalWeekPicker::contentsMouseReleaseEvent(QMouseEvent *e) | 919 | KDateInternalWeekPicker::contentsMouseReleaseEvent(QMouseEvent *e) |
920 | { | 920 | { |
921 | if(!isEnabled()) | 921 | if(!isEnabled()) |
922 | { | 922 | { |
923 | return; | 923 | return; |
924 | } | 924 | } |
925 | // ----- | 925 | // ----- |
926 | int row, col, pos; | 926 | int row, col, pos; |
927 | QPoint mouseCoord; | 927 | QPoint mouseCoord; |
928 | // ----- | 928 | // ----- |
929 | mouseCoord = e->pos(); | 929 | mouseCoord = e->pos(); |
930 | row=rowAt(mouseCoord.y()); | 930 | row=rowAt(mouseCoord.y()); |
931 | col=columnAt(mouseCoord.x()); | 931 | col=columnAt(mouseCoord.x()); |
932 | if(row<0 || col<0) | 932 | if(row<0 || col<0) |
933 | { // the user clicked on the frame of the table | 933 | { // the user clicked on the frame of the table |
934 | emit(closeMe(0)); | 934 | emit(closeMe(0)); |
935 | } | 935 | } |
936 | pos=4*row+col+1; | 936 | pos=4*row+col+1; |
937 | result=pos; | 937 | result=pos; |
938 | emit(closeMe(1)); | 938 | emit(closeMe(1)); |
939 | } | 939 | } |
diff --git a/microkde/kdecore/kstandarddirs.cpp b/microkde/kdecore/kstandarddirs.cpp index 810c889..4ab1a68 100644 --- a/microkde/kdecore/kstandarddirs.cpp +++ b/microkde/kdecore/kstandarddirs.cpp | |||
@@ -1,1686 +1,1688 @@ | |||
1 | /* This file is part of the KDE libraries | 1 | /* This file is part of the KDE libraries |
2 | Copyright (C) 1999 Sirtaj Singh Kang <taj@kde.org> | 2 | Copyright (C) 1999 Sirtaj Singh Kang <taj@kde.org> |
3 | Copyright (C) 1999 Stephan Kulow <coolo@kde.org> | 3 | Copyright (C) 1999 Stephan Kulow <coolo@kde.org> |
4 | Copyright (C) 1999 Waldo Bastian <bastian@kde.org> | 4 | Copyright (C) 1999 Waldo Bastian <bastian@kde.org> |
5 | 5 | ||
6 | This library is free software; you can redistribute it and/or | 6 | This library is free software; you can redistribute it and/or |
7 | modify it under the terms of the GNU Library General Public | 7 | modify it under the terms of the GNU Library General Public |
8 | License version 2 as published by the Free Software Foundation. | 8 | License version 2 as published by the Free Software Foundation. |
9 | 9 | ||
10 | This library is distributed in the hope that it will be useful, | 10 | This library is distributed in the hope that it will be useful, |
11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
13 | Library General Public License for more details. | 13 | Library General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU Library General Public License | 15 | You should have received a copy of the GNU Library General Public License |
16 | along with this library; see the file COPYING.LIB. If not, write to | 16 | along with this library; see the file COPYING.LIB. If not, write to |
17 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 17 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
18 | Boston, MA 02111-1307, USA. | 18 | Boston, MA 02111-1307, USA. |
19 | */ | 19 | */ |
20 | 20 | ||
21 | /* | 21 | /* |
22 | * Author: Stephan Kulow <coolo@kde.org> and Sirtaj Singh Kang <taj@kde.org> | 22 | * Author: Stephan Kulow <coolo@kde.org> and Sirtaj Singh Kang <taj@kde.org> |
23 | * Version:$Id$ | 23 | * Version:$Id$ |
24 | * Generated:Thu Mar 5 16:05:28 EST 1998 | 24 | * Generated:Thu Mar 5 16:05:28 EST 1998 |
25 | */ | 25 | */ |
26 | 26 | ||
27 | //US #include "config.h" | 27 | //US #include "config.h" |
28 | 28 | ||
29 | #include <stdlib.h> | 29 | #include <stdlib.h> |
30 | #include <assert.h> | 30 | #include <assert.h> |
31 | //US#include <errno.h> | 31 | //US#include <errno.h> |
32 | //US #ifdef HAVE_SYS_STAT_H | 32 | //US #ifdef HAVE_SYS_STAT_H |
33 | //US #include <sys/stat.h> | 33 | //US #include <sys/stat.h> |
34 | //US #endif | 34 | //US #endif |
35 | //US#include <sys/types.h> | 35 | //US#include <sys/types.h> |
36 | //US#include <dirent.h> | 36 | //US#include <dirent.h> |
37 | //US#include <pwd.h> | 37 | //US#include <pwd.h> |
38 | 38 | ||
39 | #include <qregexp.h> | 39 | #include <qregexp.h> |
40 | #include <qasciidict.h> | 40 | #include <qasciidict.h> |
41 | #include <qdict.h> | 41 | #include <qdict.h> |
42 | #include <qdir.h> | 42 | #include <qdir.h> |
43 | #include <qfileinfo.h> | 43 | #include <qfileinfo.h> |
44 | #include <qstring.h> | 44 | #include <qstring.h> |
45 | #include <qmessagebox.h> | 45 | #include <qmessagebox.h> |
46 | #include <qapplication.h> | 46 | #include <qapplication.h> |
47 | 47 | ||
48 | #include <qstringlist.h> | 48 | #include <qstringlist.h> |
49 | 49 | ||
50 | #include "kstandarddirs.h" | 50 | #include "kstandarddirs.h" |
51 | #include "kconfig.h" | 51 | #include "kconfig.h" |
52 | #include "kdebug.h" | 52 | #include "kdebug.h" |
53 | //US #include "kinstance.h" | 53 | //US #include "kinstance.h" |
54 | #include "kshell.h" | 54 | #include "kshell.h" |
55 | //US#include <sys/param.h> | 55 | //US#include <sys/param.h> |
56 | //US#include <unistd.h> | 56 | //US#include <unistd.h> |
57 | 57 | ||
58 | //US | 58 | //US |
59 | QString KStandardDirs::mAppDir = QString::null; | 59 | QString KStandardDirs::mAppDir = QString::null; |
60 | 60 | ||
61 | 61 | ||
62 | template class QDict<QStringList>; | 62 | template class QDict<QStringList>; |
63 | 63 | ||
64 | #if 0 | 64 | #if 0 |
65 | #include <qtextedit.h> | 65 | #include <qtextedit.h> |
66 | void ddd( QString op ) | 66 | void ddd( QString op ) |
67 | { | 67 | { |
68 | static QTextEdit * dot = 0; | 68 | static QTextEdit * dot = 0; |
69 | if ( ! dot ) | 69 | if ( ! dot ) |
70 | dot = new QTextEdit(); | 70 | dot = new QTextEdit(); |
71 | 71 | ||
72 | dot->show(); | 72 | dot->show(); |
73 | 73 | ||
74 | dot->append( op ); | 74 | dot->append( op ); |
75 | 75 | ||
76 | } | 76 | } |
77 | #endif | 77 | #endif |
78 | class KStandardDirs::KStandardDirsPrivate | 78 | class KStandardDirs::KStandardDirsPrivate |
79 | { | 79 | { |
80 | public: | 80 | public: |
81 | KStandardDirsPrivate() | 81 | KStandardDirsPrivate() |
82 | : restrictionsActive(false), | 82 | : restrictionsActive(false), |
83 | dataRestrictionActive(false) | 83 | dataRestrictionActive(false) |
84 | { } | 84 | { } |
85 | 85 | ||
86 | bool restrictionsActive; | 86 | bool restrictionsActive; |
87 | bool dataRestrictionActive; | 87 | bool dataRestrictionActive; |
88 | QAsciiDict<bool> restrictions; | 88 | QAsciiDict<bool> restrictions; |
89 | QStringList xdgdata_prefixes; | 89 | QStringList xdgdata_prefixes; |
90 | QStringList xdgconf_prefixes; | 90 | QStringList xdgconf_prefixes; |
91 | }; | 91 | }; |
92 | 92 | ||
93 | static const char* const types[] = {"html", "icon", "apps", "sound", | 93 | static const char* const types[] = {"html", "icon", "apps", "sound", |
94 | "data", "locale", "services", "mime", | 94 | "data", "locale", "services", "mime", |
95 | "servicetypes", "config", "exe", "tmp", | 95 | "servicetypes", "config", "exe", "tmp", |
96 | "wallpaper", "lib", "pixmap", "templates", | 96 | "wallpaper", "lib", "pixmap", "templates", |
97 | "module", "qtplugins", | 97 | "module", "qtplugins", |
98 | "xdgdata-apps", "xdgdata-dirs", "xdgconf-menu", 0 }; | 98 | "xdgdata-apps", "xdgdata-dirs", "xdgconf-menu", 0 }; |
99 | 99 | ||
100 | static int tokenize( QStringList& token, const QString& str, | 100 | static int tokenize( QStringList& token, const QString& str, |
101 | const QString& delim ); | 101 | const QString& delim ); |
102 | 102 | ||
103 | KStandardDirs::KStandardDirs( ) : addedCustoms(false) | 103 | KStandardDirs::KStandardDirs( ) : addedCustoms(false) |
104 | { | 104 | { |
105 | d = new KStandardDirsPrivate; | 105 | d = new KStandardDirsPrivate; |
106 | dircache.setAutoDelete(true); | 106 | dircache.setAutoDelete(true); |
107 | relatives.setAutoDelete(true); | 107 | relatives.setAutoDelete(true); |
108 | absolutes.setAutoDelete(true); | 108 | absolutes.setAutoDelete(true); |
109 | savelocations.setAutoDelete(true); | 109 | savelocations.setAutoDelete(true); |
110 | addKDEDefaults(); | 110 | addKDEDefaults(); |
111 | } | 111 | } |
112 | 112 | ||
113 | KStandardDirs::~KStandardDirs() | 113 | KStandardDirs::~KStandardDirs() |
114 | { | 114 | { |
115 | delete d; | 115 | delete d; |
116 | } | 116 | } |
117 | 117 | ||
118 | bool KStandardDirs::isRestrictedResource(const char *type, const QString& relPath) const | 118 | bool KStandardDirs::isRestrictedResource(const char *type, const QString& relPath) const |
119 | { | 119 | { |
120 | if (!d || !d->restrictionsActive) | 120 | if (!d || !d->restrictionsActive) |
121 | return false; | 121 | return false; |
122 | 122 | ||
123 | if (d->restrictions[type]) | 123 | if (d->restrictions[type]) |
124 | return true; | 124 | return true; |
125 | 125 | ||
126 | if (strcmp(type, "data")==0) | 126 | if (strcmp(type, "data")==0) |
127 | { | 127 | { |
128 | applyDataRestrictions(relPath); | 128 | applyDataRestrictions(relPath); |
129 | if (d->dataRestrictionActive) | 129 | if (d->dataRestrictionActive) |
130 | { | 130 | { |
131 | d->dataRestrictionActive = false; | 131 | d->dataRestrictionActive = false; |
132 | return true; | 132 | return true; |
133 | } | 133 | } |
134 | } | 134 | } |
135 | return false; | 135 | return false; |
136 | } | 136 | } |
137 | 137 | ||
138 | void KStandardDirs::applyDataRestrictions(const QString &relPath) const | 138 | void KStandardDirs::applyDataRestrictions(const QString &relPath) const |
139 | { | 139 | { |
140 | QString key; | 140 | QString key; |
141 | int i = relPath.find('/'); | 141 | int i = relPath.find('/'); |
142 | if (i != -1) | 142 | if (i != -1) |
143 | key = "data_"+relPath.left(i); | 143 | key = "data_"+relPath.left(i); |
144 | else | 144 | else |
145 | key = "data_"+relPath; | 145 | key = "data_"+relPath; |
146 | 146 | ||
147 | if (d && d->restrictions[key.latin1()]) | 147 | if (d && d->restrictions[key.latin1()]) |
148 | d->dataRestrictionActive = true; | 148 | d->dataRestrictionActive = true; |
149 | } | 149 | } |
150 | 150 | ||
151 | 151 | ||
152 | QStringList KStandardDirs::allTypes() const | 152 | QStringList KStandardDirs::allTypes() const |
153 | { | 153 | { |
154 | QStringList list; | 154 | QStringList list; |
155 | for (int i = 0; types[i] != 0; ++i) | 155 | for (int i = 0; types[i] != 0; ++i) |
156 | list.append(QString::fromLatin1(types[i])); | 156 | list.append(QString::fromLatin1(types[i])); |
157 | return list; | 157 | return list; |
158 | } | 158 | } |
159 | 159 | ||
160 | void KStandardDirs::addPrefix( const QString& _dir ) | 160 | void KStandardDirs::addPrefix( const QString& _dir ) |
161 | { | 161 | { |
162 | if (_dir.isNull()) | 162 | if (_dir.isNull()) |
163 | return; | 163 | return; |
164 | 164 | ||
165 | QString dir = _dir; | 165 | QString dir = _dir; |
166 | if (dir.at(dir.length() - 1) != '/') | 166 | if (dir.at(dir.length() - 1) != '/') |
167 | dir += '/'; | 167 | dir += '/'; |
168 | 168 | ||
169 | if (!prefixes.contains(dir)) { | 169 | if (!prefixes.contains(dir)) { |
170 | prefixes.append(dir); | 170 | prefixes.append(dir); |
171 | dircache.clear(); | 171 | dircache.clear(); |
172 | } | 172 | } |
173 | } | 173 | } |
174 | 174 | ||
175 | void KStandardDirs::addXdgConfigPrefix( const QString& _dir ) | 175 | void KStandardDirs::addXdgConfigPrefix( const QString& _dir ) |
176 | { | 176 | { |
177 | if (_dir.isNull()) | 177 | if (_dir.isNull()) |
178 | return; | 178 | return; |
179 | 179 | ||
180 | QString dir = _dir; | 180 | QString dir = _dir; |
181 | if (dir.at(dir.length() - 1) != '/') | 181 | if (dir.at(dir.length() - 1) != '/') |
182 | dir += '/'; | 182 | dir += '/'; |
183 | 183 | ||
184 | if (!d->xdgconf_prefixes.contains(dir)) { | 184 | if (!d->xdgconf_prefixes.contains(dir)) { |
185 | d->xdgconf_prefixes.append(dir); | 185 | d->xdgconf_prefixes.append(dir); |
186 | dircache.clear(); | 186 | dircache.clear(); |
187 | } | 187 | } |
188 | } | 188 | } |
189 | 189 | ||
190 | void KStandardDirs::addXdgDataPrefix( const QString& _dir ) | 190 | void KStandardDirs::addXdgDataPrefix( const QString& _dir ) |
191 | { | 191 | { |
192 | if (_dir.isNull()) | 192 | if (_dir.isNull()) |
193 | return; | 193 | return; |
194 | 194 | ||
195 | QString dir = _dir; | 195 | QString dir = _dir; |
196 | if (dir.at(dir.length() - 1) != '/') | 196 | if (dir.at(dir.length() - 1) != '/') |
197 | dir += '/'; | 197 | dir += '/'; |
198 | 198 | ||
199 | if (!d->xdgdata_prefixes.contains(dir)) { | 199 | if (!d->xdgdata_prefixes.contains(dir)) { |
200 | d->xdgdata_prefixes.append(dir); | 200 | d->xdgdata_prefixes.append(dir); |
201 | dircache.clear(); | 201 | dircache.clear(); |
202 | } | 202 | } |
203 | } | 203 | } |
204 | 204 | ||
205 | 205 | ||
206 | QString KStandardDirs::kfsstnd_prefixes() | 206 | QString KStandardDirs::kfsstnd_prefixes() |
207 | { | 207 | { |
208 | return prefixes.join(":"); | 208 | return prefixes.join(":"); |
209 | } | 209 | } |
210 | 210 | ||
211 | bool KStandardDirs::addResourceType( const char *type, | 211 | bool KStandardDirs::addResourceType( const char *type, |
212 | const QString& relativename ) | 212 | const QString& relativename ) |
213 | { | 213 | { |
214 | if (relativename.isNull()) | 214 | if (relativename.isNull()) |
215 | return false; | 215 | return false; |
216 | 216 | ||
217 | QStringList *rels = relatives.find(type); | 217 | QStringList *rels = relatives.find(type); |
218 | if (!rels) { | 218 | if (!rels) { |
219 | rels = new QStringList(); | 219 | rels = new QStringList(); |
220 | relatives.insert(type, rels); | 220 | relatives.insert(type, rels); |
221 | } | 221 | } |
222 | QString copy = relativename; | 222 | QString copy = relativename; |
223 | if (copy.at(copy.length() - 1) != '/') | 223 | if (copy.at(copy.length() - 1) != '/') |
224 | copy += '/'; | 224 | copy += '/'; |
225 | if (!rels->contains(copy)) { | 225 | if (!rels->contains(copy)) { |
226 | rels->prepend(copy); | 226 | rels->prepend(copy); |
227 | dircache.remove(type); // clean the cache | 227 | dircache.remove(type); // clean the cache |
228 | return true; | 228 | return true; |
229 | } | 229 | } |
230 | return false; | 230 | return false; |
231 | } | 231 | } |
232 | 232 | ||
233 | bool KStandardDirs::addResourceDir( const char *type, | 233 | bool KStandardDirs::addResourceDir( const char *type, |
234 | const QString& absdir) | 234 | const QString& absdir) |
235 | { | 235 | { |
236 | QStringList *paths = absolutes.find(type); | 236 | QStringList *paths = absolutes.find(type); |
237 | if (!paths) { | 237 | if (!paths) { |
238 | paths = new QStringList(); | 238 | paths = new QStringList(); |
239 | absolutes.insert(type, paths); | 239 | absolutes.insert(type, paths); |
240 | } | 240 | } |
241 | QString copy = absdir; | 241 | QString copy = absdir; |
242 | if (copy.at(copy.length() - 1) != '/') | 242 | if (copy.at(copy.length() - 1) != '/') |
243 | copy += '/'; | 243 | copy += '/'; |
244 | 244 | ||
245 | if (!paths->contains(copy)) { | 245 | if (!paths->contains(copy)) { |
246 | paths->append(copy); | 246 | paths->append(copy); |
247 | dircache.remove(type); // clean the cache | 247 | dircache.remove(type); // clean the cache |
248 | return true; | 248 | return true; |
249 | } | 249 | } |
250 | return false; | 250 | return false; |
251 | } | 251 | } |
252 | 252 | ||
253 | QString KStandardDirs::findResource( const char *type, | 253 | QString KStandardDirs::findResource( const char *type, |
254 | const QString& filename ) const | 254 | const QString& filename ) const |
255 | { | 255 | { |
256 | if (filename.at(0) == '/') | 256 | if (filename.at(0) == '/') |
257 | return filename; // absolute dirs are absolute dirs, right? :-/ | 257 | return filename; // absolute dirs are absolute dirs, right? :-/ |
258 | 258 | ||
259 | #if 0 | 259 | #if 0 |
260 | kdDebug() << "Find resource: " << type << endl; | 260 | kdDebug() << "Find resource: " << type << endl; |
261 | for (QStringList::ConstIterator pit = prefixes.begin(); | 261 | for (QStringList::ConstIterator pit = prefixes.begin(); |
262 | pit != prefixes.end(); | 262 | pit != prefixes.end(); |
263 | pit++) | 263 | pit++) |
264 | { | 264 | { |
265 | kdDebug() << "Prefix: " << *pit << endl; | 265 | kdDebug() << "Prefix: " << *pit << endl; |
266 | } | 266 | } |
267 | #endif | 267 | #endif |
268 | 268 | ||
269 | QString dir = findResourceDir(type, filename); | 269 | QString dir = findResourceDir(type, filename); |
270 | if (dir.isNull()) | 270 | if (dir.isNull()) |
271 | return dir; | 271 | return dir; |
272 | else return dir + filename; | 272 | else return dir + filename; |
273 | } | 273 | } |
274 | /*US | 274 | /*US |
275 | static Q_UINT32 updateHash(const QString &file, Q_UINT32 hash) | 275 | static Q_UINT32 updateHash(const QString &file, Q_UINT32 hash) |
276 | { | 276 | { |
277 | QCString cFile = QFile::encodeName(file); | 277 | QCString cFile = QFile::encodeName(file); |
278 | //US struct stat buff; | 278 | //US struct stat buff; |
279 | //US if ((access(cFile, R_OK) == 0) && | 279 | //US if ((access(cFile, R_OK) == 0) && |
280 | //US (stat( cFile, &buff ) == 0) && | 280 | //US (stat( cFile, &buff ) == 0) && |
281 | //US (S_ISREG( buff.st_mode ))) | 281 | //US (S_ISREG( buff.st_mode ))) |
282 | QFileInfo pathfnInfo(cFile); | 282 | QFileInfo pathfnInfo(cFile); |
283 | if (( pathfnInfo.isReadable() == true ) && | 283 | if (( pathfnInfo.isReadable() == true ) && |
284 | ( pathfnInfo.isFile()) ) | 284 | ( pathfnInfo.isFile()) ) |
285 | { | 285 | { |
286 | //US hash = hash + (Q_UINT32) buff.st_ctime; | 286 | //US hash = hash + (Q_UINT32) buff.st_ctime; |
287 | hash = hash + (Q_UINT32) pathfnInfo.lastModified(); | 287 | hash = hash + (Q_UINT32) pathfnInfo.lastModified(); |
288 | } | 288 | } |
289 | return hash; | 289 | return hash; |
290 | } | 290 | } |
291 | */ | 291 | */ |
292 | /*US | 292 | /*US |
293 | Q_UINT32 KStandardDirs::calcResourceHash( const char *type, | 293 | Q_UINT32 KStandardDirs::calcResourceHash( const char *type, |
294 | const QString& filename, bool deep) const | 294 | const QString& filename, bool deep) const |
295 | { | 295 | { |
296 | Q_UINT32 hash = 0; | 296 | Q_UINT32 hash = 0; |
297 | 297 | ||
298 | if (filename.at(0) == '/') | 298 | if (filename.at(0) == '/') |
299 | { | 299 | { |
300 | // absolute dirs are absolute dirs, right? :-/ | 300 | // absolute dirs are absolute dirs, right? :-/ |
301 | return updateHash(filename, hash); | 301 | return updateHash(filename, hash); |
302 | } | 302 | } |
303 | if (d && d->restrictionsActive && (strcmp(type, "data")==0)) | 303 | if (d && d->restrictionsActive && (strcmp(type, "data")==0)) |
304 | applyDataRestrictions(filename); | 304 | applyDataRestrictions(filename); |
305 | QStringList candidates = resourceDirs(type); | 305 | QStringList candidates = resourceDirs(type); |
306 | QString fullPath; | 306 | QString fullPath; |
307 | 307 | ||
308 | for (QStringList::ConstIterator it = candidates.begin(); | 308 | for (QStringList::ConstIterator it = candidates.begin(); |
309 | it != candidates.end(); it++) | 309 | it != candidates.end(); it++) |
310 | { | 310 | { |
311 | hash = updateHash(*it + filename, hash); | 311 | hash = updateHash(*it + filename, hash); |
312 | if (!deep && hash) | 312 | if (!deep && hash) |
313 | return hash; | 313 | return hash; |
314 | } | 314 | } |
315 | return hash; | 315 | return hash; |
316 | } | 316 | } |
317 | */ | 317 | */ |
318 | 318 | ||
319 | QStringList KStandardDirs::findDirs( const char *type, | 319 | QStringList KStandardDirs::findDirs( const char *type, |
320 | const QString& reldir ) const | 320 | const QString& reldir ) const |
321 | { | 321 | { |
322 | QStringList list; | 322 | QStringList list; |
323 | 323 | ||
324 | checkConfig(); | 324 | checkConfig(); |
325 | 325 | ||
326 | if (d && d->restrictionsActive && (strcmp(type, "data")==0)) | 326 | if (d && d->restrictionsActive && (strcmp(type, "data")==0)) |
327 | applyDataRestrictions(reldir); | 327 | applyDataRestrictions(reldir); |
328 | QStringList candidates = resourceDirs(type); | 328 | QStringList candidates = resourceDirs(type); |
329 | QDir testdir; | 329 | QDir testdir; |
330 | 330 | ||
331 | for (QStringList::ConstIterator it = candidates.begin(); | 331 | for (QStringList::ConstIterator it = candidates.begin(); |
332 | it != candidates.end(); it++) { | 332 | it != candidates.end(); it++) { |
333 | testdir.setPath(*it + reldir); | 333 | testdir.setPath(*it + reldir); |
334 | if (testdir.exists()) | 334 | if (testdir.exists()) |
335 | list.append(testdir.absPath() + '/'); | 335 | list.append(testdir.absPath() + '/'); |
336 | } | 336 | } |
337 | 337 | ||
338 | return list; | 338 | return list; |
339 | } | 339 | } |
340 | 340 | ||
341 | QString KStandardDirs::findResourceDir( const char *type, | 341 | QString KStandardDirs::findResourceDir( const char *type, |
342 | const QString& filename) const | 342 | const QString& filename) const |
343 | { | 343 | { |
344 | #ifndef NDEBUG | 344 | #ifndef NDEBUG |
345 | if (filename.isEmpty()) { | 345 | if (filename.isEmpty()) { |
346 | kdWarning() << "filename for type " << type << " in KStandardDirs::findResourceDir is not supposed to be empty!!" << endl; | 346 | kdWarning() << "filename for type " << type << " in KStandardDirs::findResourceDir is not supposed to be empty!!" << endl; |
347 | return QString::null; | 347 | return QString::null; |
348 | } | 348 | } |
349 | #endif | 349 | #endif |
350 | 350 | ||
351 | if (d && d->restrictionsActive && (strcmp(type, "data")==0)) | 351 | if (d && d->restrictionsActive && (strcmp(type, "data")==0)) |
352 | applyDataRestrictions(filename); | 352 | applyDataRestrictions(filename); |
353 | QStringList candidates = resourceDirs(type); | 353 | QStringList candidates = resourceDirs(type); |
354 | QString fullPath; | 354 | QString fullPath; |
355 | #ifdef DESKTOP_VERSION | 355 | #ifdef DESKTOP_VERSION |
356 | #ifdef _WIN32_ | 356 | #ifdef _WIN32_ |
357 | candidates.prepend( qApp->applicationDirPath () +"\\"); | 357 | candidates.prepend( qApp->applicationDirPath () +"\\"); |
358 | #else | 358 | #else |
359 | candidates.prepend( qApp->applicationDirPath () +"/"); | 359 | candidates.prepend( qApp->applicationDirPath () +"/"); |
360 | #endif | 360 | #endif |
361 | #endif | 361 | #endif |
362 | for (QStringList::ConstIterator it = candidates.begin(); it != candidates.end(); it++) | 362 | for (QStringList::ConstIterator it = candidates.begin(); it != candidates.end(); it++) |
363 | { | 363 | { |
364 | //qDebug("looking for dir %s - file %s", (*it).latin1(), filename.latin1()); | 364 | //qDebug("looking for dir %s - file %s", (*it).latin1(), filename.latin1()); |
365 | if (exists(*it + filename)) | 365 | if (exists(*it + filename)) |
366 | return *it; | 366 | return *it; |
367 | } | 367 | } |
368 | 368 | ||
369 | #ifndef NDEBUG | 369 | #ifndef NDEBUG |
370 | if(false && type != "locale") | 370 | if(false && type != "locale") |
371 | qDebug("KStdDirs::findResDir(): can't find %s ", filename.latin1()); | 371 | qDebug("KStdDirs::findResDir(): can't find %s ", filename.latin1()); |
372 | 372 | ||
373 | #endif | 373 | #endif |
374 | 374 | ||
375 | return QString::null; | 375 | return QString::null; |
376 | } | 376 | } |
377 | 377 | ||
378 | bool KStandardDirs::exists(const QString &fullPath) | 378 | bool KStandardDirs::exists(const QString &fullPath) |
379 | { | 379 | { |
380 | //US struct stat buff; | 380 | //US struct stat buff; |
381 | QFileInfo fullPathInfo(QFile::encodeName(fullPath)); | 381 | QFileInfo fullPathInfo(QFile::encodeName(fullPath)); |
382 | 382 | ||
383 | //US if (access(QFile::encodeName(fullPath), R_OK) == 0 && fullPathInfo.isReadable()) | 383 | //US if (access(QFile::encodeName(fullPath), R_OK) == 0 && fullPathInfo.isReadable()) |
384 | if (fullPathInfo.isReadable()) | 384 | if (fullPathInfo.isReadable()) |
385 | { | 385 | { |
386 | if (fullPath.at(fullPath.length() - 1) != '/') { | 386 | if (fullPath.at(fullPath.length() - 1) != '/') { |
387 | //US if (S_ISREG( buff.st_mode )) | 387 | //US if (S_ISREG( buff.st_mode )) |
388 | if (fullPathInfo.isFile()) | 388 | if (fullPathInfo.isFile()) |
389 | return true; | 389 | return true; |
390 | } | 390 | } |
391 | else { | 391 | else { |
392 | //US if (S_ISDIR( buff.st_mode )) | 392 | //US if (S_ISDIR( buff.st_mode )) |
393 | if (fullPathInfo.isDir()) | 393 | if (fullPathInfo.isDir()) |
394 | return true; | 394 | return true; |
395 | } | 395 | } |
396 | } | 396 | } |
397 | return false; | 397 | return false; |
398 | } | 398 | } |
399 | 399 | ||
400 | static void lookupDirectory(const QString& path, const QString &relPart, | 400 | static void lookupDirectory(const QString& path, const QString &relPart, |
401 | const QRegExp ®exp, | 401 | const QRegExp ®exp, |
402 | QStringList& list, | 402 | QStringList& list, |
403 | QStringList& relList, | 403 | QStringList& relList, |
404 | bool recursive, bool uniq) | 404 | bool recursive, bool uniq) |
405 | { | 405 | { |
406 | QString pattern = regexp.pattern(); | 406 | QString pattern = regexp.pattern(); |
407 | if (recursive || pattern.contains('?') || pattern.contains('*')) | 407 | if (recursive || pattern.contains('?') || pattern.contains('*')) |
408 | { | 408 | { |
409 | // We look for a set of files. | 409 | // We look for a set of files. |
410 | //US DIR *dp = opendir( QFile::encodeName(path)); | 410 | //US DIR *dp = opendir( QFile::encodeName(path)); |
411 | QDir dp(QFile::encodeName(path)); | 411 | QDir dp(QFile::encodeName(path)); |
412 | 412 | ||
413 | if (!dp.exists()) | 413 | if (!dp.exists()) |
414 | return; | 414 | return; |
415 | static int iii = 0; | 415 | static int iii = 0; |
416 | ++iii; | 416 | ++iii; |
417 | if ( iii == 5 ) | 417 | if ( iii == 5 ) |
418 | abort(); | 418 | abort(); |
419 | assert(path.at(path.length() - 1) == '/'); | 419 | assert(path.at(path.length() - 1) == '/'); |
420 | 420 | ||
421 | //US struct dirent *ep; | 421 | //US struct dirent *ep; |
422 | //US struct stat buff; | 422 | //US struct stat buff; |
423 | 423 | ||
424 | QString _dot("."); | 424 | QString _dot("."); |
425 | QString _dotdot(".."); | 425 | QString _dotdot(".."); |
426 | 426 | ||
427 | //US while( ( ep = readdir( dp ) ) != 0L ) | 427 | //US while( ( ep = readdir( dp ) ) != 0L ) |
428 | QStringList direntries = dp.entryList(); | 428 | QStringList direntries = dp.entryList(); |
429 | QStringList::Iterator it = direntries.begin(); | 429 | QStringList::Iterator it = direntries.begin(); |
430 | 430 | ||
431 | while ( it != list.end() ) // for each file... | 431 | while ( it != list.end() ) // for each file... |
432 | { | 432 | { |
433 | 433 | ||
434 | //US QString fn( QFile::decodeName(ep->d_name)); | 434 | //US QString fn( QFile::decodeName(ep->d_name)); |
435 | QString fn = (*it); // dp.entryList already decodes | 435 | QString fn = (*it); // dp.entryList already decodes |
436 | it++; | 436 | it++; |
437 | if ( fn.isNull() ) | 437 | if ( fn.isNull() ) |
438 | break; | 438 | break; |
439 | 439 | ||
440 | if (fn == _dot || fn == _dotdot || fn.at(fn.length() - 1).latin1() == '~' ) | 440 | if (fn == _dot || fn == _dotdot || fn.at(fn.length() - 1).latin1() == '~' ) |
441 | continue; | 441 | continue; |
442 | 442 | ||
443 | /*US | 443 | /*US |
444 | if (!recursive && !regexp.exactMatch(fn)) | 444 | if (!recursive && !regexp.exactMatch(fn)) |
445 | continue; // No match | 445 | continue; // No match |
446 | */ | 446 | */ |
447 | //US this should do the same: | 447 | //US this should do the same: |
448 | int pos = regexp.match(fn); | 448 | int pos = regexp.match(fn); |
449 | if (!recursive && !pos == 0) | 449 | if (!recursive && !pos == 0) |
450 | continue; // No match | 450 | continue; // No match |
451 | 451 | ||
452 | QString pathfn = path + fn; | 452 | QString pathfn = path + fn; |
453 | /*US | 453 | /*US |
454 | if ( stat( QFile::encodeName(pathfn), &buff ) != 0 ) { | 454 | if ( stat( QFile::encodeName(pathfn), &buff ) != 0 ) { |
455 | kdDebug() << "Error stat'ing " << pathfn << " : " << perror << endl; | 455 | kdDebug() << "Error stat'ing " << pathfn << " : " << perror << endl; |
456 | continue; // Couldn't stat (e.g. no read permissions) | 456 | continue; // Couldn't stat (e.g. no read permissions) |
457 | } | 457 | } |
458 | 458 | ||
459 | if ( recursive ) | 459 | if ( recursive ) |
460 | { | 460 | { |
461 | if ( S_ISDIR( buff.st_mode )) { | 461 | if ( S_ISDIR( buff.st_mode )) { |
462 | lookupDirectory(pathfn + '/', relPart + fn + '/', regexp, list, relList, recursive, uniq); | 462 | lookupDirectory(pathfn + '/', relPart + fn + '/', regexp, list, relList, recursive, uniq); |
463 | } | 463 | } |
464 | */ | 464 | */ |
465 | //US replacement: | 465 | //US replacement: |
466 | QFileInfo pathfnInfo(QFile::encodeName(pathfn)); | 466 | QFileInfo pathfnInfo(QFile::encodeName(pathfn)); |
467 | if ( pathfnInfo.isReadable() == false ) | 467 | if ( pathfnInfo.isReadable() == false ) |
468 | { | 468 | { |
469 | //US kdDebug() << "Error stat'ing " << pathfn << " : " << perror << endl; | 469 | //US kdDebug() << "Error stat'ing " << pathfn << " : " << perror << endl; |
470 | continue; // Couldn't stat (e.g. no read permissions) | 470 | continue; // Couldn't stat (e.g. no read permissions) |
471 | } | 471 | } |
472 | 472 | ||
473 | if ( recursive ) | 473 | if ( recursive ) |
474 | { | 474 | { |
475 | if ( pathfnInfo.isDir()) { | 475 | if ( pathfnInfo.isDir()) { |
476 | lookupDirectory(pathfn + '/', relPart + fn + '/', regexp, list, relList, recursive, uniq); | 476 | lookupDirectory(pathfn + '/', relPart + fn + '/', regexp, list, relList, recursive, uniq); |
477 | } | 477 | } |
478 | 478 | ||
479 | 479 | ||
480 | /*US | 480 | /*US |
481 | if (!regexp.exactMatch(fn)) | 481 | if (!regexp.exactMatch(fn)) |
482 | continue; // No match | 482 | continue; // No match |
483 | */ | 483 | */ |
484 | //US this should do the same: | 484 | //US this should do the same: |
485 | pos = regexp.match(fn); | 485 | pos = regexp.match(fn); |
486 | if (!pos == 0) | 486 | if (!pos == 0) |
487 | continue; // No match | 487 | continue; // No match |
488 | } | 488 | } |
489 | 489 | ||
490 | //US if ( S_ISREG( buff.st_mode)) | 490 | //US if ( S_ISREG( buff.st_mode)) |
491 | if ( pathfnInfo.isFile()) | 491 | if ( pathfnInfo.isFile()) |
492 | { | 492 | { |
493 | if (!uniq || !relList.contains(relPart + fn)) | 493 | if (!uniq || !relList.contains(relPart + fn)) |
494 | { | 494 | { |
495 | list.append( pathfn ); | 495 | list.append( pathfn ); |
496 | relList.append( relPart + fn ); | 496 | relList.append( relPart + fn ); |
497 | } | 497 | } |
498 | } | 498 | } |
499 | } | 499 | } |
500 | //US closedir( dp ); | 500 | //US closedir( dp ); |
501 | } | 501 | } |
502 | else | 502 | else |
503 | { | 503 | { |
504 | // We look for a single file. | 504 | // We look for a single file. |
505 | QString fn = pattern; | 505 | QString fn = pattern; |
506 | QString pathfn = path + fn; | 506 | QString pathfn = path + fn; |
507 | //US struct stat buff; | 507 | //US struct stat buff; |
508 | QFileInfo pathfnInfo(QFile::encodeName(pathfn)); | 508 | QFileInfo pathfnInfo(QFile::encodeName(pathfn)); |
509 | 509 | ||
510 | 510 | ||
511 | //US if ( stat( QFile::encodeName(pathfn), &buff ) != 0 ) | 511 | //US if ( stat( QFile::encodeName(pathfn), &buff ) != 0 ) |
512 | if ( pathfnInfo.isReadable() == false ) | 512 | if ( pathfnInfo.isReadable() == false ) |
513 | return; // File not found | 513 | return; // File not found |
514 | 514 | ||
515 | //US if ( S_ISREG( buff.st_mode)) | 515 | //US if ( S_ISREG( buff.st_mode)) |
516 | if ( pathfnInfo.isFile()) | 516 | if ( pathfnInfo.isFile()) |
517 | { | 517 | { |
518 | if (!uniq || !relList.contains(relPart + fn)) | 518 | if (!uniq || !relList.contains(relPart + fn)) |
519 | { | 519 | { |
520 | list.append( pathfn ); | 520 | list.append( pathfn ); |
521 | relList.append( relPart + fn ); | 521 | relList.append( relPart + fn ); |
522 | } | 522 | } |
523 | } | 523 | } |
524 | } | 524 | } |
525 | } | 525 | } |
526 | 526 | ||
527 | static void lookupPrefix(const QString& prefix, const QString& relpath, | 527 | static void lookupPrefix(const QString& prefix, const QString& relpath, |
528 | const QString& relPart, | 528 | const QString& relPart, |
529 | const QRegExp ®exp, | 529 | const QRegExp ®exp, |
530 | QStringList& list, | 530 | QStringList& list, |
531 | QStringList& relList, | 531 | QStringList& relList, |
532 | bool recursive, bool uniq) | 532 | bool recursive, bool uniq) |
533 | { | 533 | { |
534 | if (relpath.isNull()) { | 534 | if (relpath.isNull()) { |
535 | lookupDirectory(prefix, relPart, regexp, list, | 535 | lookupDirectory(prefix, relPart, regexp, list, |
536 | relList, recursive, uniq); | 536 | relList, recursive, uniq); |
537 | return; | 537 | return; |
538 | } | 538 | } |
539 | QString path; | 539 | QString path; |
540 | QString rest; | 540 | QString rest; |
541 | 541 | ||
542 | if (relpath.length()) | 542 | if (relpath.length()) |
543 | { | 543 | { |
544 | int slash = relpath.find('/'); | 544 | int slash = relpath.find('/'); |
545 | if (slash < 0) | 545 | if (slash < 0) |
546 | rest = relpath.left(relpath.length() - 1); | 546 | rest = relpath.left(relpath.length() - 1); |
547 | else { | 547 | else { |
548 | path = relpath.left(slash); | 548 | path = relpath.left(slash); |
549 | rest = relpath.mid(slash + 1); | 549 | rest = relpath.mid(slash + 1); |
550 | } | 550 | } |
551 | } | 551 | } |
552 | assert(prefix.at(prefix.length() - 1) == '/'); | 552 | assert(prefix.at(prefix.length() - 1) == '/'); |
553 | 553 | ||
554 | //US struct stat buff; | 554 | //US struct stat buff; |
555 | 555 | ||
556 | if (path.contains('*') || path.contains('?')) { | 556 | if (path.contains('*') || path.contains('?')) { |
557 | QRegExp pathExp(path, true, true); | 557 | QRegExp pathExp(path, true, true); |
558 | //USDIR *dp = opendir( QFile::encodeName(prefix) ); | 558 | //USDIR *dp = opendir( QFile::encodeName(prefix) ); |
559 | QDir dp(QFile::encodeName(prefix)); | 559 | QDir dp(QFile::encodeName(prefix)); |
560 | 560 | ||
561 | //USif (!dp) | 561 | //USif (!dp) |
562 | if (!dp.exists()) | 562 | if (!dp.exists()) |
563 | { | 563 | { |
564 | return; | 564 | return; |
565 | } | 565 | } |
566 | 566 | ||
567 | //USstruct dirent *ep; | 567 | //USstruct dirent *ep; |
568 | 568 | ||
569 | QString _dot("."); | 569 | QString _dot("."); |
570 | QString _dotdot(".."); | 570 | QString _dotdot(".."); |
571 | 571 | ||
572 | //USwhile( ( ep = readdir( dp ) ) != 0L ) | 572 | //USwhile( ( ep = readdir( dp ) ) != 0L ) |
573 | QStringList direntries = dp.entryList(); | 573 | QStringList direntries = dp.entryList(); |
574 | QStringList::Iterator it = direntries.begin(); | 574 | QStringList::Iterator it = direntries.begin(); |
575 | 575 | ||
576 | while ( it != list.end() ) // for each file... | 576 | while ( it != list.end() ) // for each file... |
577 | { | 577 | { |
578 | //US QString fn( QFile::decodeName(ep->d_name)); | 578 | //US QString fn( QFile::decodeName(ep->d_name)); |
579 | QString fn = (*it); // dp.entryList() already encodes the strings | 579 | QString fn = (*it); // dp.entryList() already encodes the strings |
580 | it++; | 580 | it++; |
581 | 581 | ||
582 | if (fn == _dot || fn == _dotdot || fn.at(fn.length() - 1) == '~') | 582 | if (fn == _dot || fn == _dotdot || fn.at(fn.length() - 1) == '~') |
583 | continue; | 583 | continue; |
584 | 584 | ||
585 | #ifdef DESKTOP_VERSION | 585 | #ifdef DESKTOP_VERSION |
586 | 586 | ||
587 | if (pathExp.search(fn) == -1) | 587 | if (pathExp.search(fn) == -1) |
588 | continue; // No match | 588 | continue; // No match |
589 | 589 | ||
590 | #else | 590 | #else |
591 | //US this should do the same: | 591 | //US this should do the same: |
592 | if (pathExp.find(fn, 0) == -1) | 592 | if (pathExp.find(fn, 0) == -1) |
593 | continue; // No match | 593 | continue; // No match |
594 | #endif | 594 | #endif |
595 | QString rfn = relPart+fn; | 595 | QString rfn = relPart+fn; |
596 | fn = prefix + fn; | 596 | fn = prefix + fn; |
597 | //US if ( stat( QFile::encodeName(fn), &buff ) != 0 ) | 597 | //US if ( stat( QFile::encodeName(fn), &buff ) != 0 ) |
598 | QFileInfo fnInfo(QFile::encodeName(fn)); | 598 | QFileInfo fnInfo(QFile::encodeName(fn)); |
599 | if ( fnInfo.isReadable() == false ) | 599 | if ( fnInfo.isReadable() == false ) |
600 | { | 600 | { |
601 | //US kdDebug() << "Error statting " << fn << " : " << perror << endl; | 601 | //US kdDebug() << "Error statting " << fn << " : " << perror << endl; |
602 | continue; // Couldn't stat (e.g. no permissions) | 602 | continue; // Couldn't stat (e.g. no permissions) |
603 | } | 603 | } |
604 | //US if ( S_ISDIR( buff.st_mode )) | 604 | //US if ( S_ISDIR( buff.st_mode )) |
605 | if ( fnInfo.isDir() ) | 605 | if ( fnInfo.isDir() ) |
606 | 606 | ||
607 | lookupPrefix(fn + '/', rest, rfn + '/', regexp, list, relList, recursive, uniq); | 607 | lookupPrefix(fn + '/', rest, rfn + '/', regexp, list, relList, recursive, uniq); |
608 | } | 608 | } |
609 | 609 | ||
610 | //USclosedir( dp ); | 610 | //USclosedir( dp ); |
611 | } else { | 611 | } else { |
612 | // Don't stat, if the dir doesn't exist we will find out | 612 | // Don't stat, if the dir doesn't exist we will find out |
613 | // when we try to open it. | 613 | // when we try to open it. |
614 | lookupPrefix(prefix + path + '/', rest, | 614 | lookupPrefix(prefix + path + '/', rest, |
615 | relPart + path + '/', regexp, list, | 615 | relPart + path + '/', regexp, list, |
616 | relList, recursive, uniq); | 616 | relList, recursive, uniq); |
617 | } | 617 | } |
618 | } | 618 | } |
619 | 619 | ||
620 | QStringList | 620 | QStringList |
621 | KStandardDirs::findAllResources( const char *type, | 621 | KStandardDirs::findAllResources( const char *type, |
622 | const QString& filter, | 622 | const QString& filter, |
623 | bool recursive, | 623 | bool recursive, |
624 | bool uniq, | 624 | bool uniq, |
625 | QStringList &relList) const | 625 | QStringList &relList) const |
626 | { | 626 | { |
627 | QStringList list; | 627 | QStringList list; |
628 | if (filter.at(0) == '/') // absolute paths we return | 628 | if (filter.at(0) == '/') // absolute paths we return |
629 | { | 629 | { |
630 | list.append( filter); | 630 | list.append( filter); |
631 | return list; | 631 | return list; |
632 | } | 632 | } |
633 | 633 | ||
634 | QString filterPath; | 634 | QString filterPath; |
635 | QString filterFile; | 635 | QString filterFile; |
636 | 636 | ||
637 | if (filter.length()) | 637 | if (filter.length()) |
638 | { | 638 | { |
639 | int slash = filter.findRev('/'); | 639 | int slash = filter.findRev('/'); |
640 | if (slash < 0) | 640 | if (slash < 0) |
641 | filterFile = filter; | 641 | filterFile = filter; |
642 | else { | 642 | else { |
643 | filterPath = filter.left(slash + 1); | 643 | filterPath = filter.left(slash + 1); |
644 | filterFile = filter.mid(slash + 1); | 644 | filterFile = filter.mid(slash + 1); |
645 | } | 645 | } |
646 | } | 646 | } |
647 | checkConfig(); | 647 | checkConfig(); |
648 | 648 | ||
649 | if (d && d->restrictionsActive && (strcmp(type, "data")==0)) | 649 | if (d && d->restrictionsActive && (strcmp(type, "data")==0)) |
650 | applyDataRestrictions(filter); | 650 | applyDataRestrictions(filter); |
651 | QStringList candidates = resourceDirs(type); | 651 | QStringList candidates = resourceDirs(type); |
652 | if (filterFile.isEmpty()) | 652 | if (filterFile.isEmpty()) |
653 | filterFile = "*"; | 653 | filterFile = "*"; |
654 | 654 | ||
655 | QRegExp regExp(filterFile, true, true); | 655 | QRegExp regExp(filterFile, true, true); |
656 | for (QStringList::ConstIterator it = candidates.begin(); | 656 | for (QStringList::ConstIterator it = candidates.begin(); |
657 | it != candidates.end(); it++) | 657 | it != candidates.end(); it++) |
658 | { | 658 | { |
659 | lookupPrefix(*it, filterPath, "", regExp, list, | 659 | lookupPrefix(*it, filterPath, "", regExp, list, |
660 | relList, recursive, uniq); | 660 | relList, recursive, uniq); |
661 | } | 661 | } |
662 | return list; | 662 | return list; |
663 | } | 663 | } |
664 | 664 | ||
665 | QStringList | 665 | QStringList |
666 | KStandardDirs::findAllResources( const char *type, | 666 | KStandardDirs::findAllResources( const char *type, |
667 | const QString& filter, | 667 | const QString& filter, |
668 | bool recursive, | 668 | bool recursive, |
669 | bool uniq) const | 669 | bool uniq) const |
670 | { | 670 | { |
671 | QStringList relList; | 671 | QStringList relList; |
672 | return findAllResources(type, filter, recursive, uniq, relList); | 672 | return findAllResources(type, filter, recursive, uniq, relList); |
673 | } | 673 | } |
674 | 674 | ||
675 | QString | 675 | QString |
676 | KStandardDirs::realPath(const QString &dirname) | 676 | KStandardDirs::realPath(const QString &dirname) |
677 | { | 677 | { |
678 | #ifdef _WIN32_ | 678 | #ifdef _WIN32_ |
679 | return dirname; | 679 | return dirname; |
680 | #else | 680 | #else |
681 | //US char realpath_buffer[MAXPATHLEN + 1]; | 681 | //US char realpath_buffer[MAXPATHLEN + 1]; |
682 | //US memset(realpath_buffer, 0, MAXPATHLEN + 1); | 682 | //US memset(realpath_buffer, 0, MAXPATHLEN + 1); |
683 | char realpath_buffer[250 + 1]; | 683 | char realpath_buffer[250 + 1]; |
684 | memset(realpath_buffer, 0, 250 + 1); | 684 | memset(realpath_buffer, 0, 250 + 1); |
685 | 685 | ||
686 | /* If the path contains symlinks, get the real name */ | 686 | /* If the path contains symlinks, get the real name */ |
687 | if (realpath( QFile::encodeName(dirname).data(), realpath_buffer) != 0) { | 687 | if (realpath( QFile::encodeName(dirname).data(), realpath_buffer) != 0) { |
688 | // succes, use result from realpath | 688 | // succes, use result from realpath |
689 | int len = strlen(realpath_buffer); | 689 | int len = strlen(realpath_buffer); |
690 | realpath_buffer[len] = '/'; | 690 | realpath_buffer[len] = '/'; |
691 | realpath_buffer[len+1] = 0; | 691 | realpath_buffer[len+1] = 0; |
692 | return QFile::decodeName(realpath_buffer); | 692 | return QFile::decodeName(realpath_buffer); |
693 | } | 693 | } |
694 | 694 | ||
695 | return dirname; | 695 | return dirname; |
696 | #endif | 696 | #endif |
697 | } | 697 | } |
698 | /*US | 698 | /*US |
699 | void KStandardDirs::createSpecialResource(const char *type) | 699 | void KStandardDirs::createSpecialResource(const char *type) |
700 | { | 700 | { |
701 | char hostname[256]; | 701 | char hostname[256]; |
702 | hostname[0] = 0; | 702 | hostname[0] = 0; |
703 | gethostname(hostname, 255); | 703 | gethostname(hostname, 255); |
704 | QString dir = QString("%1%2-%3").arg(localkdedir()).arg(type).arg(hostname); | 704 | QString dir = QString("%1%2-%3").arg(localkdedir()).arg(type).arg(hostname); |
705 | char link[1024]; | 705 | char link[1024]; |
706 | link[1023] = 0; | 706 | link[1023] = 0; |
707 | int result = readlink(QFile::encodeName(dir).data(), link, 1023); | 707 | int result = readlink(QFile::encodeName(dir).data(), link, 1023); |
708 | if ((result == -1) && (errno == ENOENT)) | 708 | if ((result == -1) && (errno == ENOENT)) |
709 | { | 709 | { |
710 | QString srv = findExe(QString::fromLatin1("lnusertemp"), KDEDIR+QString::fromLatin1("/bin")); | 710 | QString srv = findExe(QString::fromLatin1("lnusertemp"), KDEDIR+QString::fromLatin1("/bin")); |
711 | if (srv.isEmpty()) | 711 | if (srv.isEmpty()) |
712 | srv = findExe(QString::fromLatin1("lnusertemp")); | 712 | srv = findExe(QString::fromLatin1("lnusertemp")); |
713 | if (!srv.isEmpty()) | 713 | if (!srv.isEmpty()) |
714 | { | 714 | { |
715 | system(QFile::encodeName(srv)+" "+type); | 715 | system(QFile::encodeName(srv)+" "+type); |
716 | result = readlink(QFile::encodeName(dir).data(), link, 1023); | 716 | result = readlink(QFile::encodeName(dir).data(), link, 1023); |
717 | } | 717 | } |
718 | } | 718 | } |
719 | if (result > 0) | 719 | if (result > 0) |
720 | { | 720 | { |
721 | link[result] = 0; | 721 | link[result] = 0; |
722 | if (link[0] == '/') | 722 | if (link[0] == '/') |
723 | dir = QFile::decodeName(link); | 723 | dir = QFile::decodeName(link); |
724 | else | 724 | else |
725 | dir = QDir::cleanDirPath(dir+QFile::decodeName(link)); | 725 | dir = QDir::cleanDirPath(dir+QFile::decodeName(link)); |
726 | } | 726 | } |
727 | addResourceDir(type, dir+'/'); | 727 | addResourceDir(type, dir+'/'); |
728 | } | 728 | } |
729 | */ | 729 | */ |
730 | 730 | ||
731 | QStringList KStandardDirs::resourceDirs(const char *type) const | 731 | QStringList KStandardDirs::resourceDirs(const char *type) const |
732 | { | 732 | { |
733 | QStringList *candidates = dircache.find(type); | 733 | QStringList *candidates = dircache.find(type); |
734 | 734 | ||
735 | if (!candidates) { // filling cache | 735 | if (!candidates) { // filling cache |
736 | /*US | 736 | /*US |
737 | if (strcmp(type, "socket") == 0) | 737 | if (strcmp(type, "socket") == 0) |
738 | const_cast<KStandardDirs *>(this)->createSpecialResource(type); | 738 | const_cast<KStandardDirs *>(this)->createSpecialResource(type); |
739 | else if (strcmp(type, "tmp") == 0) | 739 | else if (strcmp(type, "tmp") == 0) |
740 | const_cast<KStandardDirs *>(this)->createSpecialResource(type); | 740 | const_cast<KStandardDirs *>(this)->createSpecialResource(type); |
741 | else if (strcmp(type, "cache") == 0) | 741 | else if (strcmp(type, "cache") == 0) |
742 | const_cast<KStandardDirs *>(this)->createSpecialResource(type); | 742 | const_cast<KStandardDirs *>(this)->createSpecialResource(type); |
743 | */ | 743 | */ |
744 | QDir testdir; | 744 | QDir testdir; |
745 | 745 | ||
746 | candidates = new QStringList(); | 746 | candidates = new QStringList(); |
747 | QStringList *dirs; | 747 | QStringList *dirs; |
748 | 748 | ||
749 | bool restrictionActive = false; | 749 | bool restrictionActive = false; |
750 | if (d && d->restrictionsActive) | 750 | if (d && d->restrictionsActive) |
751 | { | 751 | { |
752 | if (d->dataRestrictionActive) | 752 | if (d->dataRestrictionActive) |
753 | restrictionActive = true; | 753 | restrictionActive = true; |
754 | else if (d->restrictions["all"]) | 754 | else if (d->restrictions["all"]) |
755 | restrictionActive = true; | 755 | restrictionActive = true; |
756 | else if (d->restrictions[type]) | 756 | else if (d->restrictions[type]) |
757 | restrictionActive = true; | 757 | restrictionActive = true; |
758 | d->dataRestrictionActive = false; // Reset | 758 | d->dataRestrictionActive = false; // Reset |
759 | } | 759 | } |
760 | 760 | ||
761 | dirs = relatives.find(type); | 761 | dirs = relatives.find(type); |
762 | if (dirs) | 762 | if (dirs) |
763 | { | 763 | { |
764 | bool local = true; | 764 | bool local = true; |
765 | const QStringList *prefixList = 0; | 765 | const QStringList *prefixList = 0; |
766 | if (strncmp(type, "xdgdata-", 8) == 0) | 766 | if (strncmp(type, "xdgdata-", 8) == 0) |
767 | prefixList = &(d->xdgdata_prefixes); | 767 | prefixList = &(d->xdgdata_prefixes); |
768 | else if (strncmp(type, "xdgconf-", 8) == 0) | 768 | else if (strncmp(type, "xdgconf-", 8) == 0) |
769 | prefixList = &(d->xdgconf_prefixes); | 769 | prefixList = &(d->xdgconf_prefixes); |
770 | else | 770 | else |
771 | prefixList = &prefixes; | 771 | prefixList = &prefixes; |
772 | 772 | ||
773 | for (QStringList::ConstIterator pit = prefixList->begin(); | 773 | for (QStringList::ConstIterator pit = prefixList->begin(); |
774 | pit != prefixList->end(); | 774 | pit != prefixList->end(); |
775 | pit++) | 775 | pit++) |
776 | { | 776 | { |
777 | for (QStringList::ConstIterator it = dirs->begin(); | 777 | for (QStringList::ConstIterator it = dirs->begin(); |
778 | it != dirs->end(); ++it) { | 778 | it != dirs->end(); ++it) { |
779 | QString path = realPath(*pit + *it); | 779 | QString path = realPath(*pit + *it); |
780 | testdir.setPath(path); | 780 | testdir.setPath(path); |
781 | if (local && restrictionActive) | 781 | if (local && restrictionActive) |
782 | continue; | 782 | continue; |
783 | if ((local || testdir.exists()) && !candidates->contains(path)) | 783 | if ((local || testdir.exists()) && !candidates->contains(path)) |
784 | candidates->append(path); | 784 | candidates->append(path); |
785 | } | 785 | } |
786 | local = false; | 786 | local = false; |
787 | } | 787 | } |
788 | } | 788 | } |
789 | dirs = absolutes.find(type); | 789 | dirs = absolutes.find(type); |
790 | if (dirs) | 790 | if (dirs) |
791 | for (QStringList::ConstIterator it = dirs->begin(); | 791 | for (QStringList::ConstIterator it = dirs->begin(); |
792 | it != dirs->end(); ++it) | 792 | it != dirs->end(); ++it) |
793 | { | 793 | { |
794 | testdir.setPath(*it); | 794 | testdir.setPath(*it); |
795 | if (testdir.exists()) | 795 | if (testdir.exists()) |
796 | { | 796 | { |
797 | QString filename = realPath(*it); | 797 | QString filename = realPath(*it); |
798 | if (!candidates->contains(filename)) | 798 | if (!candidates->contains(filename)) |
799 | candidates->append(filename); | 799 | candidates->append(filename); |
800 | } | 800 | } |
801 | } | 801 | } |
802 | dircache.insert(type, candidates); | 802 | dircache.insert(type, candidates); |
803 | } | 803 | } |
804 | 804 | ||
805 | #if 0 | 805 | #if 0 |
806 | kdDebug() << "found dirs for resource " << type << ":" << endl; | 806 | kdDebug() << "found dirs for resource " << type << ":" << endl; |
807 | for (QStringList::ConstIterator pit = candidates->begin(); | 807 | for (QStringList::ConstIterator pit = candidates->begin(); |
808 | pit != candidates->end(); | 808 | pit != candidates->end(); |
809 | pit++) | 809 | pit++) |
810 | { | 810 | { |
811 | fprintf(stderr, "%s\n", (*pit).latin1()); | 811 | fprintf(stderr, "%s\n", (*pit).latin1()); |
812 | } | 812 | } |
813 | #endif | 813 | #endif |
814 | 814 | ||
815 | 815 | ||
816 | return *candidates; | 816 | return *candidates; |
817 | } | 817 | } |
818 | 818 | ||
819 | /*US | 819 | /*US |
820 | QString KStandardDirs::findExe( const QString& appname, | 820 | QString KStandardDirs::findExe( const QString& appname, |
821 | const QString& pstr, bool ignore) | 821 | const QString& pstr, bool ignore) |
822 | { | 822 | { |
823 | QFileInfo info; | 823 | QFileInfo info; |
824 | 824 | ||
825 | // absolute path ? | 825 | // absolute path ? |
826 | if (appname.startsWith(QString::fromLatin1("/"))) | 826 | if (appname.startsWith(QString::fromLatin1("/"))) |
827 | { | 827 | { |
828 | info.setFile( appname ); | 828 | info.setFile( appname ); |
829 | if( info.exists() && ( ignore || info.isExecutable() ) | 829 | if( info.exists() && ( ignore || info.isExecutable() ) |
830 | && info.isFile() ) { | 830 | && info.isFile() ) { |
831 | return appname; | 831 | return appname; |
832 | } | 832 | } |
833 | return QString::null; | 833 | return QString::null; |
834 | } | 834 | } |
835 | 835 | ||
836 | //US QString p = QString("%1/%2").arg(__KDE_BINDIR).arg(appname); | 836 | //US QString p = QString("%1/%2").arg(__KDE_BINDIR).arg(appname); |
837 | QString p = QString("%1/%2").arg(appname).arg(appname); | 837 | QString p = QString("%1/%2").arg(appname).arg(appname); |
838 | qDebug("KStandardDirs::findExe this is probably wrong"); | 838 | qDebug("KStandardDirs::findExe this is probably wrong"); |
839 | 839 | ||
840 | info.setFile( p ); | 840 | info.setFile( p ); |
841 | if( info.exists() && ( ignore || info.isExecutable() ) | 841 | if( info.exists() && ( ignore || info.isExecutable() ) |
842 | && ( info.isFile() || info.isSymLink() ) ) { | 842 | && ( info.isFile() || info.isSymLink() ) ) { |
843 | return p; | 843 | return p; |
844 | } | 844 | } |
845 | 845 | ||
846 | QStringList tokens; | 846 | QStringList tokens; |
847 | p = pstr; | 847 | p = pstr; |
848 | 848 | ||
849 | if( p.isNull() ) { | 849 | if( p.isNull() ) { |
850 | p = getenv( "PATH" ); | 850 | p = getenv( "PATH" ); |
851 | } | 851 | } |
852 | 852 | ||
853 | tokenize( tokens, p, ":\b" ); | 853 | tokenize( tokens, p, ":\b" ); |
854 | 854 | ||
855 | // split path using : or \b as delimiters | 855 | // split path using : or \b as delimiters |
856 | for( unsigned i = 0; i < tokens.count(); i++ ) { | 856 | for( unsigned i = 0; i < tokens.count(); i++ ) { |
857 | p = tokens[ i ]; | 857 | p = tokens[ i ]; |
858 | 858 | ||
859 | if ( p[ 0 ] == '~' ) | 859 | if ( p[ 0 ] == '~' ) |
860 | { | 860 | { |
861 | int len = p.find( '/' ); | 861 | int len = p.find( '/' ); |
862 | if ( len == -1 ) | 862 | if ( len == -1 ) |
863 | len = p.length(); | 863 | len = p.length(); |
864 | if ( len == 1 ) | 864 | if ( len == 1 ) |
865 | p.replace( 0, 1, QDir::homeDirPath() ); | 865 | p.replace( 0, 1, QDir::homeDirPath() ); |
866 | else | 866 | else |
867 | { | 867 | { |
868 | QString user = p.mid( 1, len - 1 ); | 868 | QString user = p.mid( 1, len - 1 ); |
869 | struct passwd *dir = getpwnam( user.local8Bit().data() ); | 869 | struct passwd *dir = getpwnam( user.local8Bit().data() ); |
870 | if ( dir && strlen( dir->pw_dir ) ) | 870 | if ( dir && strlen( dir->pw_dir ) ) |
871 | p.replace( 0, len, QString::fromLocal8Bit( dir->pw_dir ) ); | 871 | p.replace( 0, len, QString::fromLocal8Bit( dir->pw_dir ) ); |
872 | } | 872 | } |
873 | } | 873 | } |
874 | 874 | ||
875 | p += "/"; | 875 | p += "/"; |
876 | p += appname; | 876 | p += appname; |
877 | 877 | ||
878 | // Check for executable in this tokenized path | 878 | // Check for executable in this tokenized path |
879 | info.setFile( p ); | 879 | info.setFile( p ); |
880 | 880 | ||
881 | if( info.exists() && ( ignore || info.isExecutable() ) | 881 | if( info.exists() && ( ignore || info.isExecutable() ) |
882 | && ( info.isFile() || info.isSymLink() ) ) { | 882 | && ( info.isFile() || info.isSymLink() ) ) { |
883 | return p; | 883 | return p; |
884 | } | 884 | } |
885 | } | 885 | } |
886 | 886 | ||
887 | // If we reach here, the executable wasn't found. | 887 | // If we reach here, the executable wasn't found. |
888 | // So return empty string. | 888 | // So return empty string. |
889 | 889 | ||
890 | return QString::null; | 890 | return QString::null; |
891 | } | 891 | } |
892 | 892 | ||
893 | int KStandardDirs::findAllExe( QStringList& list, const QString& appname, | 893 | int KStandardDirs::findAllExe( QStringList& list, const QString& appname, |
894 | const QString& pstr, bool ignore ) | 894 | const QString& pstr, bool ignore ) |
895 | { | 895 | { |
896 | QString p = pstr; | 896 | QString p = pstr; |
897 | QFileInfo info; | 897 | QFileInfo info; |
898 | QStringList tokens; | 898 | QStringList tokens; |
899 | 899 | ||
900 | if( p.isNull() ) { | 900 | if( p.isNull() ) { |
901 | p = getenv( "PATH" ); | 901 | p = getenv( "PATH" ); |
902 | } | 902 | } |
903 | 903 | ||
904 | list.clear(); | 904 | list.clear(); |
905 | tokenize( tokens, p, ":\b" ); | 905 | tokenize( tokens, p, ":\b" ); |
906 | 906 | ||
907 | for ( unsigned i = 0; i < tokens.count(); i++ ) { | 907 | for ( unsigned i = 0; i < tokens.count(); i++ ) { |
908 | p = tokens[ i ]; | 908 | p = tokens[ i ]; |
909 | p += "/"; | 909 | p += "/"; |
910 | p += appname; | 910 | p += appname; |
911 | 911 | ||
912 | info.setFile( p ); | 912 | info.setFile( p ); |
913 | 913 | ||
914 | if( info.exists() && (ignore || info.isExecutable()) | 914 | if( info.exists() && (ignore || info.isExecutable()) |
915 | && info.isFile() ) { | 915 | && info.isFile() ) { |
916 | list.append( p ); | 916 | list.append( p ); |
917 | } | 917 | } |
918 | 918 | ||
919 | } | 919 | } |
920 | 920 | ||
921 | return list.count(); | 921 | return list.count(); |
922 | } | 922 | } |
923 | */ | 923 | */ |
924 | 924 | ||
925 | static int tokenize( QStringList& tokens, const QString& str, | 925 | static int tokenize( QStringList& tokens, const QString& str, |
926 | const QString& delim ) | 926 | const QString& delim ) |
927 | { | 927 | { |
928 | int len = str.length(); | 928 | int len = str.length(); |
929 | QString token = ""; | 929 | QString token = ""; |
930 | 930 | ||
931 | for( int index = 0; index < len; index++) | 931 | for( int index = 0; index < len; index++) |
932 | { | 932 | { |
933 | if ( delim.find( str[ index ] ) >= 0 ) | 933 | if ( delim.find( str[ index ] ) >= 0 ) |
934 | { | 934 | { |
935 | tokens.append( token ); | 935 | tokens.append( token ); |
936 | token = ""; | 936 | token = ""; |
937 | } | 937 | } |
938 | else | 938 | else |
939 | { | 939 | { |
940 | token += str[ index ]; | 940 | token += str[ index ]; |
941 | } | 941 | } |
942 | } | 942 | } |
943 | if ( token.length() > 0 ) | 943 | if ( token.length() > 0 ) |
944 | { | 944 | { |
945 | tokens.append( token ); | 945 | tokens.append( token ); |
946 | } | 946 | } |
947 | 947 | ||
948 | return tokens.count(); | 948 | return tokens.count(); |
949 | } | 949 | } |
950 | 950 | ||
951 | QString KStandardDirs::kde_default(const char *type) { | 951 | QString KStandardDirs::kde_default(const char *type) { |
952 | if (!strcmp(type, "data")) | 952 | if (!strcmp(type, "data")) |
953 | return "apps/"; | 953 | return "apps/"; |
954 | if (!strcmp(type, "html")) | 954 | if (!strcmp(type, "html")) |
955 | return "share/doc/HTML/"; | 955 | return "share/doc/HTML/"; |
956 | if (!strcmp(type, "icon")) | 956 | if (!strcmp(type, "icon")) |
957 | return "share/icons/"; | 957 | return "share/icons/"; |
958 | if (!strcmp(type, "config")) | 958 | if (!strcmp(type, "config")) |
959 | return "config/"; | 959 | return "config/"; |
960 | if (!strcmp(type, "pixmap")) | 960 | if (!strcmp(type, "pixmap")) |
961 | return "share/pixmaps/"; | 961 | return "share/pixmaps/"; |
962 | if (!strcmp(type, "apps")) | 962 | if (!strcmp(type, "apps")) |
963 | return "share/applnk/"; | 963 | return "share/applnk/"; |
964 | if (!strcmp(type, "sound")) | 964 | if (!strcmp(type, "sound")) |
965 | return "share/sounds/"; | 965 | return "share/sounds/"; |
966 | if (!strcmp(type, "locale")) | 966 | if (!strcmp(type, "locale")) |
967 | return "share/locale/"; | 967 | return "share/locale/"; |
968 | if (!strcmp(type, "services")) | 968 | if (!strcmp(type, "services")) |
969 | return "share/services/"; | 969 | return "share/services/"; |
970 | if (!strcmp(type, "servicetypes")) | 970 | if (!strcmp(type, "servicetypes")) |
971 | return "share/servicetypes/"; | 971 | return "share/servicetypes/"; |
972 | if (!strcmp(type, "mime")) | 972 | if (!strcmp(type, "mime")) |
973 | return "share/mimelnk/"; | 973 | return "share/mimelnk/"; |
974 | if (!strcmp(type, "cgi")) | 974 | if (!strcmp(type, "cgi")) |
975 | return "cgi-bin/"; | 975 | return "cgi-bin/"; |
976 | if (!strcmp(type, "wallpaper")) | 976 | if (!strcmp(type, "wallpaper")) |
977 | return "share/wallpapers/"; | 977 | return "share/wallpapers/"; |
978 | if (!strcmp(type, "templates")) | 978 | if (!strcmp(type, "templates")) |
979 | return "share/templates/"; | 979 | return "share/templates/"; |
980 | if (!strcmp(type, "exe")) | 980 | if (!strcmp(type, "exe")) |
981 | return "bin/"; | 981 | return "bin/"; |
982 | if (!strcmp(type, "lib")) | 982 | if (!strcmp(type, "lib")) |
983 | return "lib/"; | 983 | return "lib/"; |
984 | if (!strcmp(type, "module")) | 984 | if (!strcmp(type, "module")) |
985 | return "lib/kde3/"; | 985 | return "lib/kde3/"; |
986 | if (!strcmp(type, "qtplugins")) | 986 | if (!strcmp(type, "qtplugins")) |
987 | return "lib/kde3/plugins"; | 987 | return "lib/kde3/plugins"; |
988 | if (!strcmp(type, "xdgdata-apps")) | 988 | if (!strcmp(type, "xdgdata-apps")) |
989 | return "applications/"; | 989 | return "applications/"; |
990 | if (!strcmp(type, "xdgdata-dirs")) | 990 | if (!strcmp(type, "xdgdata-dirs")) |
991 | return "desktop-directories/"; | 991 | return "desktop-directories/"; |
992 | if (!strcmp(type, "xdgconf-menu")) | 992 | if (!strcmp(type, "xdgconf-menu")) |
993 | return "menus/"; | 993 | return "menus/"; |
994 | if (!strcmp(type, "tmp")) | 994 | if (!strcmp(type, "tmp")) |
995 | return "tmp/"; | 995 | return "tmp/"; |
996 | 996 | ||
997 | qFatal("unknown resource type %s", type); | 997 | qFatal("unknown resource type %s", type); |
998 | return QString::null; | 998 | return QString::null; |
999 | } | 999 | } |
1000 | 1000 | ||
1001 | QString KStandardDirs::saveLocation(const char *type, | 1001 | QString KStandardDirs::saveLocation(const char *type, |
1002 | const QString& suffix, | 1002 | const QString& suffix, |
1003 | bool create) const | 1003 | bool create) const |
1004 | { | 1004 | { |
1005 | //qDebug("KStandardDirs::saveLocation called %s %s", type,suffix.latin1() ); | 1005 | //qDebug("KStandardDirs::saveLocation called %s %s", type,suffix.latin1() ); |
1006 | //return ""; | 1006 | //return ""; |
1007 | checkConfig(); | 1007 | checkConfig(); |
1008 | 1008 | ||
1009 | QString *pPath = savelocations.find(type); | 1009 | QString *pPath = savelocations.find(type); |
1010 | if (!pPath) | 1010 | if (!pPath) |
1011 | { | 1011 | { |
1012 | QStringList *dirs = relatives.find(type); | 1012 | QStringList *dirs = relatives.find(type); |
1013 | if (!dirs && ( | 1013 | if (!dirs && ( |
1014 | (strcmp(type, "socket") == 0) || | 1014 | (strcmp(type, "socket") == 0) || |
1015 | (strcmp(type, "tmp") == 0) || | 1015 | (strcmp(type, "tmp") == 0) || |
1016 | (strcmp(type, "cache") == 0) )) | 1016 | (strcmp(type, "cache") == 0) )) |
1017 | { | 1017 | { |
1018 | (void) resourceDirs(type); // Generate socket|tmp|cache resource. | 1018 | (void) resourceDirs(type); // Generate socket|tmp|cache resource. |
1019 | dirs = relatives.find(type); // Search again. | 1019 | dirs = relatives.find(type); // Search again. |
1020 | } | 1020 | } |
1021 | if (dirs) | 1021 | if (dirs) |
1022 | { | 1022 | { |
1023 | // Check for existance of typed directory + suffix | 1023 | // Check for existance of typed directory + suffix |
1024 | if (strncmp(type, "xdgdata-", 8) == 0) | 1024 | if (strncmp(type, "xdgdata-", 8) == 0) |
1025 | pPath = new QString(realPath(localxdgdatadir() + dirs->last())); | 1025 | pPath = new QString(realPath(localxdgdatadir() + dirs->last())); |
1026 | else if (strncmp(type, "xdgconf-", 8) == 0) | 1026 | else if (strncmp(type, "xdgconf-", 8) == 0) |
1027 | pPath = new QString(realPath(localxdgconfdir() + dirs->last())); | 1027 | pPath = new QString(realPath(localxdgconfdir() + dirs->last())); |
1028 | else | 1028 | else |
1029 | pPath = new QString(realPath(localkdedir() + dirs->last())); | 1029 | pPath = new QString(realPath(localkdedir() + dirs->last())); |
1030 | } | 1030 | } |
1031 | else { | 1031 | else { |
1032 | dirs = absolutes.find(type); | 1032 | dirs = absolutes.find(type); |
1033 | if (!dirs) | 1033 | if (!dirs) |
1034 | qFatal("KStandardDirs: The resource type %s is not registered", type); | 1034 | qFatal("KStandardDirs: The resource type %s is not registered", type); |
1035 | pPath = new QString(realPath(dirs->last())); | 1035 | pPath = new QString(realPath(dirs->last())); |
1036 | } | 1036 | } |
1037 | 1037 | ||
1038 | savelocations.insert(type, pPath); | 1038 | savelocations.insert(type, pPath); |
1039 | } | 1039 | } |
1040 | 1040 | ||
1041 | QString fullPath = *pPath + suffix; | 1041 | QString fullPath = *pPath + suffix; |
1042 | //US struct stat st; | 1042 | //US struct stat st; |
1043 | //US if (stat(QFile::encodeName(fullPath), &st) != 0 || !(S_ISDIR(st.st_mode))) | 1043 | //US if (stat(QFile::encodeName(fullPath), &st) != 0 || !(S_ISDIR(st.st_mode))) |
1044 | QFileInfo fullPathInfo(QFile::encodeName(fullPath)); | 1044 | QFileInfo fullPathInfo(QFile::encodeName(fullPath)); |
1045 | if (fullPathInfo.isReadable() || !fullPathInfo.isDir()) | 1045 | if (fullPathInfo.isReadable() || !fullPathInfo.isDir()) |
1046 | 1046 | ||
1047 | 1047 | ||
1048 | { | 1048 | { |
1049 | if(!create) { | 1049 | if(!create) { |
1050 | #ifndef NDEBUG | 1050 | #ifndef NDEBUG |
1051 | qDebug("save location %s doesn't exist", fullPath.latin1()); | 1051 | qDebug("save location %s doesn't exist", fullPath.latin1()); |
1052 | #endif | 1052 | #endif |
1053 | return fullPath; | 1053 | return fullPath; |
1054 | } | 1054 | } |
1055 | if(!makeDir(fullPath, 0700)) { | 1055 | if(!makeDir(fullPath, 0700)) { |
1056 | qWarning("failed to create %s", fullPath.latin1()); | 1056 | qWarning("failed to create %s", fullPath.latin1()); |
1057 | return fullPath; | 1057 | return fullPath; |
1058 | } | 1058 | } |
1059 | dircache.remove(type); | 1059 | dircache.remove(type); |
1060 | } | 1060 | } |
1061 | return fullPath; | 1061 | return fullPath; |
1062 | } | 1062 | } |
1063 | 1063 | ||
1064 | QString KStandardDirs::relativeLocation(const char *type, const QString &absPath) | 1064 | QString KStandardDirs::relativeLocation(const char *type, const QString &absPath) |
1065 | { | 1065 | { |
1066 | QString fullPath = absPath; | 1066 | QString fullPath = absPath; |
1067 | int i = absPath.findRev('/'); | 1067 | int i = absPath.findRev('/'); |
1068 | if (i != -1) | 1068 | if (i != -1) |
1069 | { | 1069 | { |
1070 | fullPath = realPath(absPath.left(i+1))+absPath.mid(i+1); // Normalize | 1070 | fullPath = realPath(absPath.left(i+1))+absPath.mid(i+1); // Normalize |
1071 | } | 1071 | } |
1072 | 1072 | ||
1073 | QStringList candidates = resourceDirs(type); | 1073 | QStringList candidates = resourceDirs(type); |
1074 | 1074 | ||
1075 | for (QStringList::ConstIterator it = candidates.begin(); | 1075 | for (QStringList::ConstIterator it = candidates.begin(); |
1076 | it != candidates.end(); it++) | 1076 | it != candidates.end(); it++) |
1077 | if (fullPath.startsWith(*it)) | 1077 | if (fullPath.startsWith(*it)) |
1078 | { | 1078 | { |
1079 | return fullPath.mid((*it).length()); | 1079 | return fullPath.mid((*it).length()); |
1080 | } | 1080 | } |
1081 | 1081 | ||
1082 | return absPath; | 1082 | return absPath; |
1083 | } | 1083 | } |
1084 | 1084 | ||
1085 | 1085 | ||
1086 | bool KStandardDirs::makeDir(const QString& dir2, int mode) | 1086 | bool KStandardDirs::makeDir(const QString& dir2, int mode) |
1087 | { | 1087 | { |
1088 | QString dir = QDir::convertSeparators( dir2 ); | 1088 | QString dir = QDir::convertSeparators( dir2 ); |
1089 | #if 0 | 1089 | #if 0 |
1090 | //LR | 1090 | //LR |
1091 | 1091 | ||
1092 | // we want an absolute path | 1092 | // we want an absolute path |
1093 | if (dir.at(0) != '/') | 1093 | if (dir.at(0) != '/') |
1094 | return false; | 1094 | return false; |
1095 | 1095 | ||
1096 | QString target = dir; | 1096 | QString target = dir; |
1097 | uint len = target.length(); | 1097 | uint len = target.length(); |
1098 | 1098 | ||
1099 | // append trailing slash if missing | 1099 | // append trailing slash if missing |
1100 | if (dir.at(len - 1) != '/') | 1100 | if (dir.at(len - 1) != '/') |
1101 | target += '/'; | 1101 | target += '/'; |
1102 | 1102 | ||
1103 | QString base(""); | 1103 | QString base(""); |
1104 | uint i = 1; | 1104 | uint i = 1; |
1105 | 1105 | ||
1106 | while( i < len ) | 1106 | while( i < len ) |
1107 | { | 1107 | { |
1108 | //US struct stat st; | 1108 | //US struct stat st; |
1109 | int pos = target.find('/', i); | 1109 | int pos = target.find('/', i); |
1110 | base += target.mid(i - 1, pos - i + 1); | 1110 | base += target.mid(i - 1, pos - i + 1); |
1111 | QCString baseEncoded = QFile::encodeName(base); | 1111 | QCString baseEncoded = QFile::encodeName(base); |
1112 | // bail out if we encountered a problem | 1112 | // bail out if we encountered a problem |
1113 | //US if (stat(baseEncoded, &st) != 0) | 1113 | //US if (stat(baseEncoded, &st) != 0) |
1114 | QFileInfo baseEncodedInfo(baseEncoded); | 1114 | QFileInfo baseEncodedInfo(baseEncoded); |
1115 | if (!baseEncodedInfo.exists()) | 1115 | if (!baseEncodedInfo.exists()) |
1116 | { | 1116 | { |
1117 | // Directory does not exist.... | 1117 | // Directory does not exist.... |
1118 | // Or maybe a dangling symlink ? | 1118 | // Or maybe a dangling symlink ? |
1119 | //US if (lstat(baseEncoded, &st) == 0) | 1119 | //US if (lstat(baseEncoded, &st) == 0) |
1120 | if (baseEncodedInfo.isSymLink()) { | 1120 | if (baseEncodedInfo.isSymLink()) { |
1121 | //US (void)unlink(baseEncoded); // try removing | 1121 | //US (void)unlink(baseEncoded); // try removing |
1122 | QFile(baseEncoded).remove(); | 1122 | QFile(baseEncoded).remove(); |
1123 | } | 1123 | } |
1124 | 1124 | ||
1125 | //US if ( mkdir(baseEncoded, (mode_t) mode) != 0) | 1125 | //US if ( mkdir(baseEncoded, (mode_t) mode) != 0) |
1126 | QDir dirObj; | 1126 | QDir dirObj; |
1127 | if ( dirObj.mkdir(baseEncoded) != true ) | 1127 | if ( dirObj.mkdir(baseEncoded) != true ) |
1128 | { | 1128 | { |
1129 | //US perror("trying to create local folder"); | 1129 | //US perror("trying to create local folder"); |
1130 | return false; // Couldn't create it :-( | 1130 | return false; // Couldn't create it :-( |
1131 | } | 1131 | } |
1132 | } | 1132 | } |
1133 | i = pos + 1; | 1133 | i = pos + 1; |
1134 | } | 1134 | } |
1135 | return true; | 1135 | return true; |
1136 | #endif | 1136 | #endif |
1137 | 1137 | ||
1138 | // ******************************************** | 1138 | // ******************************************** |
1139 | // new code for WIN32 | 1139 | // new code for WIN32 |
1140 | QDir dirObj; | 1140 | QDir dirObj; |
1141 | 1141 | ||
1142 | 1142 | ||
1143 | // we want an absolute path | 1143 | // we want an absolute path |
1144 | #ifndef _WIN32_ | 1144 | #ifndef _WIN32_ |
1145 | if (dir.at(0) != '/') | 1145 | if (dir.at(0) != '/') |
1146 | return false; | 1146 | return false; |
1147 | #endif | 1147 | #endif |
1148 | 1148 | ||
1149 | QString target = dir; | 1149 | QString target = dir; |
1150 | uint len = target.length(); | 1150 | uint len = target.length(); |
1151 | #ifndef _WIN32_ | 1151 | #ifndef _WIN32_ |
1152 | // append trailing slash if missing | 1152 | // append trailing slash if missing |
1153 | if (dir.at(len - 1) != '/') | 1153 | if (dir.at(len - 1) != '/') |
1154 | target += '/'; | 1154 | target += '/'; |
1155 | #endif | 1155 | #endif |
1156 | 1156 | ||
1157 | QString base(""); | 1157 | QString base(""); |
1158 | uint i = 1; | 1158 | uint i = 1; |
1159 | 1159 | ||
1160 | while( i < len ) | 1160 | while( i < len ) |
1161 | { | 1161 | { |
1162 | //US struct stat st; | 1162 | //US struct stat st; |
1163 | #ifndef _WIN32_ | 1163 | #ifndef _WIN32_ |
1164 | int pos = target.find('/', i); | 1164 | int pos = target.find('/', i); |
1165 | #else | 1165 | #else |
1166 | int pos = target.find('\\', i); | 1166 | int pos = target.find('\\', i); |
1167 | #endif | 1167 | #endif |
1168 | if ( pos < 0 ) | 1168 | if ( pos < 0 ) |
1169 | return true; | 1169 | return true; |
1170 | base += target.mid(i - 1, pos - i + 1); | 1170 | base += target.mid(i - 1, pos - i + 1); |
1171 | //QMessageBox::information( 0,"cap111", base, 1 ); | 1171 | //QMessageBox::information( 0,"cap111", base, 1 ); |
1172 | /*US | 1172 | /*US |
1173 | QCString baseEncoded = QFile::encodeName(base); | 1173 | QCString baseEncoded = QFile::encodeName(base); |
1174 | // bail out if we encountered a problem | 1174 | // bail out if we encountered a problem |
1175 | if (stat(baseEncoded, &st) != 0) | 1175 | if (stat(baseEncoded, &st) != 0) |
1176 | { | 1176 | { |
1177 | // Directory does not exist.... | 1177 | // Directory does not exist.... |
1178 | // Or maybe a dangling symlink ? | 1178 | // Or maybe a dangling symlink ? |
1179 | if (lstat(baseEncoded, &st) == 0) | 1179 | if (lstat(baseEncoded, &st) == 0) |
1180 | (void)unlink(baseEncoded); // try removing | 1180 | (void)unlink(baseEncoded); // try removing |
1181 | 1181 | ||
1182 | 1182 | ||
1183 | if ( mkdir(baseEncoded, (mode_t) mode) != 0) { | 1183 | if ( mkdir(baseEncoded, (mode_t) mode) != 0) { |
1184 | perror("trying to create local folder"); | 1184 | perror("trying to create local folder"); |
1185 | return false; // Couldn't create it :-( | 1185 | return false; // Couldn't create it :-( |
1186 | } | 1186 | } |
1187 | } | 1187 | } |
1188 | */ | 1188 | */ |
1189 | 1189 | ||
1190 | if (dirObj.exists(base) == false) | 1190 | if (dirObj.exists(base) == false) |
1191 | { | 1191 | { |
1192 | //qDebug("KStandardDirs::makeDir try to create : %s" , base.latin1()); | 1192 | //qDebug("KStandardDirs::makeDir try to create : %s" , base.latin1()); |
1193 | if (dirObj.mkdir(base) != true) | 1193 | if (dirObj.mkdir(base) != true) |
1194 | { | 1194 | { |
1195 | qDebug("KStandardDirs::makeDir could not create: %s" , base.latin1()); | 1195 | qDebug("KStandardDirs::makeDir could not create: %s" , base.latin1()); |
1196 | return false; | 1196 | return false; |
1197 | } | 1197 | } |
1198 | } | 1198 | } |
1199 | 1199 | ||
1200 | i = pos + 1; | 1200 | i = pos + 1; |
1201 | } | 1201 | } |
1202 | return true; | 1202 | return true; |
1203 | 1203 | ||
1204 | } | 1204 | } |
1205 | 1205 | ||
1206 | static QString readEnvPath(const char *env) | 1206 | QString readEnvPath(const char *env) |
1207 | { | 1207 | { |
1208 | //#ifdef _WIN32_ | 1208 | //#ifdef _WIN32_ |
1209 | // return ""; | 1209 | // return ""; |
1210 | //#else | 1210 | //#else |
1211 | QCString c_path; | 1211 | QCString c_path; |
1212 | if ( getenv(env) != NULL ) | 1212 | if ( getenv(env) != NULL ) |
1213 | c_path = QString ( getenv(env) ); | 1213 | c_path = QString ( getenv(env) ); |
1214 | if (c_path.isEmpty()) | 1214 | if (c_path.isEmpty()) |
1215 | return QString::null; | 1215 | return QString::null; |
1216 | return QFile::decodeName(c_path); | 1216 | return QFile::decodeName(c_path); |
1217 | //#endif | 1217 | //#endif |
1218 | 1218 | ||
1219 | } | 1219 | } |
1220 | 1220 | ||
1221 | void KStandardDirs::addKDEDefaults() | 1221 | void KStandardDirs::addKDEDefaults() |
1222 | { | 1222 | { |
1223 | 1223 | ||
1224 | //qDebug("ERROR: KStandardDirs::addKDEDefaults() called "); | 1224 | //qDebug("ERROR: KStandardDirs::addKDEDefaults() called "); |
1225 | //return; | 1225 | //return; |
1226 | QStringList kdedirList; | 1226 | QStringList kdedirList; |
1227 | 1227 | ||
1228 | // begin KDEDIRS | 1228 | // begin KDEDIRS |
1229 | QString kdedirs = readEnvPath("MICROKDEDIRS"); | 1229 | QString kdedirs = readEnvPath("MICROKDEDIRS"); |
1230 | if (!kdedirs.isEmpty()) | 1230 | if (!kdedirs.isEmpty()) |
1231 | { | 1231 | { |
1232 | tokenize(kdedirList, kdedirs, ":"); | 1232 | tokenize(kdedirList, kdedirs, ":"); |
1233 | } | 1233 | } |
1234 | else | 1234 | else |
1235 | { | 1235 | { |
1236 | QString kdedir = readEnvPath("MICROKDEDIR"); | 1236 | QString kdedir = readEnvPath("MICROKDEDIR"); |
1237 | if (!kdedir.isEmpty()) | 1237 | if (!kdedir.isEmpty()) |
1238 | { | 1238 | { |
1239 | kdedir = KShell::tildeExpand(kdedir); | 1239 | kdedir = KShell::tildeExpand(kdedir); |
1240 | kdedirList.append(kdedir); | 1240 | kdedirList.append(kdedir); |
1241 | } | 1241 | } |
1242 | } | 1242 | } |
1243 | //US kdedirList.append(KDEDIR); | 1243 | //US kdedirList.append(KDEDIR); |
1244 | //US for embedded, add qtopia dir as kdedir | 1244 | //US for embedded, add qtopia dir as kdedir |
1245 | 1245 | ||
1246 | #ifndef DESKTOP_VERSION | 1246 | #ifndef DESKTOP_VERSION |
1247 | QString tmp = readEnvPath("QPEDIR"); | 1247 | QString tmp = readEnvPath("QPEDIR"); |
1248 | if (!tmp.isEmpty()) | 1248 | if (!tmp.isEmpty()) |
1249 | kdedirList.append(tmp); | 1249 | kdedirList.append(tmp); |
1250 | 1250 | ||
1251 | tmp = readEnvPath("QTDIR"); | 1251 | tmp = readEnvPath("QTDIR"); |
1252 | if (!tmp.isEmpty()) | 1252 | if (!tmp.isEmpty()) |
1253 | kdedirList.append(tmp); | 1253 | kdedirList.append(tmp); |
1254 | 1254 | ||
1255 | tmp = readEnvPath("OPIEDIR"); | 1255 | tmp = readEnvPath("OPIEDIR"); |
1256 | if (!tmp.isEmpty()) | 1256 | if (!tmp.isEmpty()) |
1257 | kdedirList.append(tmp); | 1257 | kdedirList.append(tmp); |
1258 | 1258 | ||
1259 | #endif | 1259 | #endif |
1260 | 1260 | ||
1261 | #ifdef __KDE_EXECPREFIX | 1261 | #ifdef __KDE_EXECPREFIX |
1262 | QString execPrefix(__KDE_EXECPREFIX); | 1262 | QString execPrefix(__KDE_EXECPREFIX); |
1263 | if (execPrefix!="NONE") | 1263 | if (execPrefix!="NONE") |
1264 | kdedirList.append(execPrefix); | 1264 | kdedirList.append(execPrefix); |
1265 | #endif | 1265 | #endif |
1266 | 1266 | ||
1267 | QString localKdeDir; | 1267 | QString localKdeDir; |
1268 | 1268 | ||
1269 | //US if (getuid()) | 1269 | //US if (getuid()) |
1270 | if (true) | 1270 | if (true) |
1271 | { | 1271 | { |
1272 | localKdeDir = readEnvPath("MICROKDEHOME"); | 1272 | localKdeDir = readEnvPath("MICROKDEHOME"); |
1273 | if (!localKdeDir.isEmpty()) | 1273 | if (!localKdeDir.isEmpty()) |
1274 | { | 1274 | { |
1275 | #ifdef _WIN32_ | 1275 | #ifdef _WIN32_ |
1276 | if (localKdeDir.at(localKdeDir.length()-1) != '\\') | 1276 | if (localKdeDir.at(localKdeDir.length()-1) != '\\') |
1277 | localKdeDir += '\\'; | 1277 | localKdeDir += '\\'; |
1278 | #else | 1278 | #else |
1279 | if (localKdeDir.at(localKdeDir.length()-1) != '/') | 1279 | if (localKdeDir.at(localKdeDir.length()-1) != '/') |
1280 | localKdeDir += '/'; | 1280 | localKdeDir += '/'; |
1281 | #endif | 1281 | #endif |
1282 | //QMessageBox::information( 0,"localKdeDir",localKdeDir, 1 ); | 1282 | //QMessageBox::information( 0,"localKdeDir",localKdeDir, 1 ); |
1283 | } | 1283 | } |
1284 | else | 1284 | else |
1285 | { | 1285 | { |
1286 | QString confFile; | 1286 | QString confFile; |
1287 | #ifdef DESKTOP_VERSION | 1287 | #ifdef DESKTOP_VERSION |
1288 | confFile = qApp->applicationDirPath ()+ "/.microkdehome" ; | 1288 | confFile = qApp->applicationDirPath ()+ "/.microkdehome" ; |
1289 | QFileInfo fi ( confFile ); | 1289 | QFileInfo fi ( confFile ); |
1290 | if ( !fi.exists() ) | 1290 | if ( !fi.exists() ) |
1291 | confFile = QDir::homeDirPath() + "/.microkdehome"; | 1291 | confFile = QDir::homeDirPath() + "/.microkdehome"; |
1292 | else | 1292 | else |
1293 | qDebug("Loading path info from " + confFile ); | 1293 | qDebug("Loading path info from " + confFile ); |
1294 | 1294 | ||
1295 | #else | 1295 | #else |
1296 | confFile = QDir::homeDirPath() + "/.microkdehome"; | 1296 | confFile = QDir::homeDirPath() + "/.microkdehome"; |
1297 | #endif | 1297 | #endif |
1298 | KConfig cfg ( confFile ); | 1298 | KConfig cfg ( confFile ); |
1299 | cfg.setGroup("Global"); | 1299 | cfg.setGroup("Global"); |
1300 | localKdeDir = cfg.readEntry( "MICROKDEHOME", QDir::homeDirPath() + "/kdepim/" ); | 1300 | localKdeDir = cfg.readEntry( "MICROKDEHOME", QDir::homeDirPath() + "/kdepim/" ); |
1301 | #ifdef DESKTOP_VERSION | 1301 | #ifdef DESKTOP_VERSION |
1302 | if ( localKdeDir.startsWith( "LOCAL:" ) ) { | 1302 | if ( localKdeDir.startsWith( "LOCAL:" ) ) { |
1303 | #ifdef _WIN32_ | 1303 | #ifdef _WIN32_ |
1304 | localKdeDir = qApp->applicationDirPath () + "\\"+ localKdeDir.mid( 6 ); | 1304 | localKdeDir = qApp->applicationDirPath () + "\\"+ localKdeDir.mid( 6 ); |
1305 | #else | 1305 | #else |
1306 | localKdeDir = qApp->applicationDirPath () + "/"+ localKdeDir.mid( 6 ); | 1306 | localKdeDir = qApp->applicationDirPath () + "/"+ localKdeDir.mid( 6 ); |
1307 | #endif | 1307 | #endif |
1308 | qDebug("Using local conf dir %s ",localKdeDir.latin1() ); | 1308 | qDebug("Using local conf dir %s ",localKdeDir.latin1() ); |
1309 | // <stdlib.h> | ||
1310 | setenv( "LOCALMICROKDEHOME", localKdeDir.latin1(), 1 ); | ||
1309 | } | 1311 | } |
1310 | #endif | 1312 | #endif |
1311 | } | 1313 | } |
1312 | } | 1314 | } |
1313 | else | 1315 | else |
1314 | { | 1316 | { |
1315 | // We treat root different to prevent root messing up the | 1317 | // We treat root different to prevent root messing up the |
1316 | // file permissions in the users home directory. | 1318 | // file permissions in the users home directory. |
1317 | localKdeDir = readEnvPath("MICROKDEROOTHOME"); | 1319 | localKdeDir = readEnvPath("MICROKDEROOTHOME"); |
1318 | if (!localKdeDir.isEmpty()) | 1320 | if (!localKdeDir.isEmpty()) |
1319 | { | 1321 | { |
1320 | if (localKdeDir.at(localKdeDir.length()-1) != '/') | 1322 | if (localKdeDir.at(localKdeDir.length()-1) != '/') |
1321 | localKdeDir += '/'; | 1323 | localKdeDir += '/'; |
1322 | } | 1324 | } |
1323 | else | 1325 | else |
1324 | { | 1326 | { |
1325 | //US struct passwd *pw = getpwuid(0); | 1327 | //US struct passwd *pw = getpwuid(0); |
1326 | //US localKdeDir = QFile::decodeName((pw && pw->pw_dir) ? pw->pw_dir : "/root") + "/.microkde/"; | 1328 | //US localKdeDir = QFile::decodeName((pw && pw->pw_dir) ? pw->pw_dir : "/root") + "/.microkde/"; |
1327 | qDebug("KStandardDirs::addKDEDefaults: 1 has to be fixed"); | 1329 | qDebug("KStandardDirs::addKDEDefaults: 1 has to be fixed"); |
1328 | } | 1330 | } |
1329 | 1331 | ||
1330 | } | 1332 | } |
1331 | 1333 | ||
1332 | //US localKdeDir = appDir(); | 1334 | //US localKdeDir = appDir(); |
1333 | 1335 | ||
1334 | //US | 1336 | //US |
1335 | // qDebug("KStandardDirs::addKDEDefaults: localKdeDir=%s", localKdeDir.latin1()); | 1337 | // qDebug("KStandardDirs::addKDEDefaults: localKdeDir=%s", localKdeDir.latin1()); |
1336 | if (localKdeDir != "-/") | 1338 | if (localKdeDir != "-/") |
1337 | { | 1339 | { |
1338 | localKdeDir = KShell::tildeExpand(localKdeDir); | 1340 | localKdeDir = KShell::tildeExpand(localKdeDir); |
1339 | addPrefix(localKdeDir); | 1341 | addPrefix(localKdeDir); |
1340 | } | 1342 | } |
1341 | 1343 | ||
1342 | for (QStringList::ConstIterator it = kdedirList.begin(); | 1344 | for (QStringList::ConstIterator it = kdedirList.begin(); |
1343 | it != kdedirList.end(); it++) | 1345 | it != kdedirList.end(); it++) |
1344 | { | 1346 | { |
1345 | QString dir = KShell::tildeExpand(*it); | 1347 | QString dir = KShell::tildeExpand(*it); |
1346 | addPrefix(dir); | 1348 | addPrefix(dir); |
1347 | } | 1349 | } |
1348 | // end KDEDIRS | 1350 | // end KDEDIRS |
1349 | 1351 | ||
1350 | // begin XDG_CONFIG_XXX | 1352 | // begin XDG_CONFIG_XXX |
1351 | QStringList xdgdirList; | 1353 | QStringList xdgdirList; |
1352 | QString xdgdirs = readEnvPath("XDG_CONFIG_DIRS"); | 1354 | QString xdgdirs = readEnvPath("XDG_CONFIG_DIRS"); |
1353 | if (!xdgdirs.isEmpty()) | 1355 | if (!xdgdirs.isEmpty()) |
1354 | { | 1356 | { |
1355 | tokenize(xdgdirList, xdgdirs, ":"); | 1357 | tokenize(xdgdirList, xdgdirs, ":"); |
1356 | } | 1358 | } |
1357 | else | 1359 | else |
1358 | { | 1360 | { |
1359 | xdgdirList.clear(); | 1361 | xdgdirList.clear(); |
1360 | xdgdirList.append("/etc/xdg"); | 1362 | xdgdirList.append("/etc/xdg"); |
1361 | } | 1363 | } |
1362 | 1364 | ||
1363 | QString localXdgDir = readEnvPath("XDG_CONFIG_HOME"); | 1365 | QString localXdgDir = readEnvPath("XDG_CONFIG_HOME"); |
1364 | if (!localXdgDir.isEmpty()) | 1366 | if (!localXdgDir.isEmpty()) |
1365 | { | 1367 | { |
1366 | if (localXdgDir.at(localXdgDir.length()-1) != '/') | 1368 | if (localXdgDir.at(localXdgDir.length()-1) != '/') |
1367 | localXdgDir += '/'; | 1369 | localXdgDir += '/'; |
1368 | } | 1370 | } |
1369 | else | 1371 | else |
1370 | { | 1372 | { |
1371 | //US if (getuid()) | 1373 | //US if (getuid()) |
1372 | if (true) | 1374 | if (true) |
1373 | { | 1375 | { |
1374 | localXdgDir = QDir::homeDirPath() + "/.config/"; | 1376 | localXdgDir = QDir::homeDirPath() + "/.config/"; |
1375 | } | 1377 | } |
1376 | else | 1378 | else |
1377 | { | 1379 | { |
1378 | //US struct passwd *pw = getpwuid(0); | 1380 | //US struct passwd *pw = getpwuid(0); |
1379 | //US localXdgDir = QFile::decodeName((pw && pw->pw_dir) ? pw->pw_dir : "/root") + "/.config/"; | 1381 | //US localXdgDir = QFile::decodeName((pw && pw->pw_dir) ? pw->pw_dir : "/root") + "/.config/"; |
1380 | qDebug("KStandardDirs::addKDEDefaults: 2 has to be fixed"); | 1382 | qDebug("KStandardDirs::addKDEDefaults: 2 has to be fixed"); |
1381 | } | 1383 | } |
1382 | } | 1384 | } |
1383 | 1385 | ||
1384 | localXdgDir = KShell::tildeExpand(localXdgDir); | 1386 | localXdgDir = KShell::tildeExpand(localXdgDir); |
1385 | addXdgConfigPrefix(localXdgDir); | 1387 | addXdgConfigPrefix(localXdgDir); |
1386 | 1388 | ||
1387 | for (QStringList::ConstIterator it = xdgdirList.begin(); | 1389 | for (QStringList::ConstIterator it = xdgdirList.begin(); |
1388 | it != xdgdirList.end(); it++) | 1390 | it != xdgdirList.end(); it++) |
1389 | { | 1391 | { |
1390 | QString dir = KShell::tildeExpand(*it); | 1392 | QString dir = KShell::tildeExpand(*it); |
1391 | addXdgConfigPrefix(dir); | 1393 | addXdgConfigPrefix(dir); |
1392 | } | 1394 | } |
1393 | // end XDG_CONFIG_XXX | 1395 | // end XDG_CONFIG_XXX |
1394 | 1396 | ||
1395 | // begin XDG_DATA_XXX | 1397 | // begin XDG_DATA_XXX |
1396 | xdgdirs = readEnvPath("XDG_DATA_DIRS"); | 1398 | xdgdirs = readEnvPath("XDG_DATA_DIRS"); |
1397 | if (!xdgdirs.isEmpty()) | 1399 | if (!xdgdirs.isEmpty()) |
1398 | { | 1400 | { |
1399 | tokenize(xdgdirList, xdgdirs, ":"); | 1401 | tokenize(xdgdirList, xdgdirs, ":"); |
1400 | } | 1402 | } |
1401 | else | 1403 | else |
1402 | { | 1404 | { |
1403 | xdgdirList.clear(); | 1405 | xdgdirList.clear(); |
1404 | for (QStringList::ConstIterator it = kdedirList.begin(); | 1406 | for (QStringList::ConstIterator it = kdedirList.begin(); |
1405 | it != kdedirList.end(); it++) | 1407 | it != kdedirList.end(); it++) |
1406 | { | 1408 | { |
1407 | QString dir = *it; | 1409 | QString dir = *it; |
1408 | if (dir.at(dir.length()-1) != '/') | 1410 | if (dir.at(dir.length()-1) != '/') |
1409 | dir += '/'; | 1411 | dir += '/'; |
1410 | xdgdirList.append(dir+"share/"); | 1412 | xdgdirList.append(dir+"share/"); |
1411 | } | 1413 | } |
1412 | 1414 | ||
1413 | xdgdirList.append("/usr/local/share/"); | 1415 | xdgdirList.append("/usr/local/share/"); |
1414 | xdgdirList.append("/usr/share/"); | 1416 | xdgdirList.append("/usr/share/"); |
1415 | } | 1417 | } |
1416 | 1418 | ||
1417 | localXdgDir = readEnvPath("XDG_DATA_HOME"); | 1419 | localXdgDir = readEnvPath("XDG_DATA_HOME"); |
1418 | if (!localXdgDir.isEmpty()) | 1420 | if (!localXdgDir.isEmpty()) |
1419 | { | 1421 | { |
1420 | if (localXdgDir.at(localXdgDir.length()-1) != '/') | 1422 | if (localXdgDir.at(localXdgDir.length()-1) != '/') |
1421 | localXdgDir += '/'; | 1423 | localXdgDir += '/'; |
1422 | } | 1424 | } |
1423 | else | 1425 | else |
1424 | { | 1426 | { |
1425 | //US if (getuid()) | 1427 | //US if (getuid()) |
1426 | if (true) | 1428 | if (true) |
1427 | { | 1429 | { |
1428 | localXdgDir = QDir::homeDirPath() + "/.local/share/"; | 1430 | localXdgDir = QDir::homeDirPath() + "/.local/share/"; |
1429 | } | 1431 | } |
1430 | else | 1432 | else |
1431 | { | 1433 | { |
1432 | //US struct passwd *pw = getpwuid(0); | 1434 | //US struct passwd *pw = getpwuid(0); |
1433 | //US localXdgDir = QFile::decodeName((pw && pw->pw_dir) ? pw->pw_dir : "/root") + "/.local/share/"; | 1435 | //US localXdgDir = QFile::decodeName((pw && pw->pw_dir) ? pw->pw_dir : "/root") + "/.local/share/"; |
1434 | qDebug("KStandardDirs::addKDEDefaults: 3 has to be fixed"); | 1436 | qDebug("KStandardDirs::addKDEDefaults: 3 has to be fixed"); |
1435 | } | 1437 | } |
1436 | } | 1438 | } |
1437 | 1439 | ||
1438 | localXdgDir = KShell::tildeExpand(localXdgDir); | 1440 | localXdgDir = KShell::tildeExpand(localXdgDir); |
1439 | addXdgDataPrefix(localXdgDir); | 1441 | addXdgDataPrefix(localXdgDir); |
1440 | 1442 | ||
1441 | for (QStringList::ConstIterator it = xdgdirList.begin(); | 1443 | for (QStringList::ConstIterator it = xdgdirList.begin(); |
1442 | it != xdgdirList.end(); it++) | 1444 | it != xdgdirList.end(); it++) |
1443 | { | 1445 | { |
1444 | QString dir = KShell::tildeExpand(*it); | 1446 | QString dir = KShell::tildeExpand(*it); |
1445 | 1447 | ||
1446 | addXdgDataPrefix(dir); | 1448 | addXdgDataPrefix(dir); |
1447 | } | 1449 | } |
1448 | // end XDG_DATA_XXX | 1450 | // end XDG_DATA_XXX |
1449 | 1451 | ||
1450 | 1452 | ||
1451 | uint index = 0; | 1453 | uint index = 0; |
1452 | while (types[index] != 0) { | 1454 | while (types[index] != 0) { |
1453 | addResourceType(types[index], kde_default(types[index])); | 1455 | addResourceType(types[index], kde_default(types[index])); |
1454 | index++; | 1456 | index++; |
1455 | } | 1457 | } |
1456 | 1458 | ||
1457 | addResourceDir("home", QDir::homeDirPath()); | 1459 | addResourceDir("home", QDir::homeDirPath()); |
1458 | } | 1460 | } |
1459 | 1461 | ||
1460 | void KStandardDirs::checkConfig() const | 1462 | void KStandardDirs::checkConfig() const |
1461 | { | 1463 | { |
1462 | /*US | 1464 | /*US |
1463 | if (!addedCustoms && KGlobal::_instance && KGlobal::_instance->_config) | 1465 | if (!addedCustoms && KGlobal::_instance && KGlobal::_instance->_config) |
1464 | const_cast<KStandardDirs*>(this)->addCustomized(KGlobal::_instance->_config); | 1466 | const_cast<KStandardDirs*>(this)->addCustomized(KGlobal::_instance->_config); |
1465 | */ | 1467 | */ |
1466 | if (!addedCustoms && KGlobal::config()) | 1468 | if (!addedCustoms && KGlobal::config()) |
1467 | const_cast<KStandardDirs*>(this)->addCustomized(KGlobal::config()); | 1469 | const_cast<KStandardDirs*>(this)->addCustomized(KGlobal::config()); |
1468 | } | 1470 | } |
1469 | 1471 | ||
1470 | bool KStandardDirs::addCustomized(KConfig *config) | 1472 | bool KStandardDirs::addCustomized(KConfig *config) |
1471 | { | 1473 | { |
1472 | if (addedCustoms) // there are already customized entries | 1474 | if (addedCustoms) // there are already customized entries |
1473 | return false; // we just quite and hope they are the right ones | 1475 | return false; // we just quite and hope they are the right ones |
1474 | 1476 | ||
1475 | // save the numbers of config directories. If this changes, | 1477 | // save the numbers of config directories. If this changes, |
1476 | // we will return true to give KConfig a chance to reparse | 1478 | // we will return true to give KConfig a chance to reparse |
1477 | uint configdirs = resourceDirs("config").count(); | 1479 | uint configdirs = resourceDirs("config").count(); |
1478 | 1480 | ||
1479 | // reading the prefixes in | 1481 | // reading the prefixes in |
1480 | QString oldGroup = config->group(); | 1482 | QString oldGroup = config->group(); |
1481 | config->setGroup("Directories"); | 1483 | config->setGroup("Directories"); |
1482 | 1484 | ||
1483 | QStringList list; | 1485 | QStringList list; |
1484 | QStringList::ConstIterator it; | 1486 | QStringList::ConstIterator it; |
1485 | list = config->readListEntry("prefixes"); | 1487 | list = config->readListEntry("prefixes"); |
1486 | for (it = list.begin(); it != list.end(); it++) | 1488 | for (it = list.begin(); it != list.end(); it++) |
1487 | addPrefix(*it); | 1489 | addPrefix(*it); |
1488 | 1490 | ||
1489 | // iterating over all entries in the group Directories | 1491 | // iterating over all entries in the group Directories |
1490 | // to find entries that start with dir_$type | 1492 | // to find entries that start with dir_$type |
1491 | /*US | 1493 | /*US |
1492 | QMap<QString, QString> entries = config->entryMap("Directories"); | 1494 | QMap<QString, QString> entries = config->entryMap("Directories"); |
1493 | 1495 | ||
1494 | QMap<QString, QString>::ConstIterator it2; | 1496 | QMap<QString, QString>::ConstIterator it2; |
1495 | for (it2 = entries.begin(); it2 != entries.end(); it2++) | 1497 | for (it2 = entries.begin(); it2 != entries.end(); it2++) |
1496 | { | 1498 | { |
1497 | QString key = it2.key(); | 1499 | QString key = it2.key(); |
1498 | if (key.left(4) == "dir_") { | 1500 | if (key.left(4) == "dir_") { |
1499 | // generate directory list, there may be more than 1. | 1501 | // generate directory list, there may be more than 1. |
1500 | QStringList dirs = QStringList::split(',', *it2); | 1502 | QStringList dirs = QStringList::split(',', *it2); |
1501 | QStringList::Iterator sIt(dirs.begin()); | 1503 | QStringList::Iterator sIt(dirs.begin()); |
1502 | QString resType = key.mid(4, key.length()); | 1504 | QString resType = key.mid(4, key.length()); |
1503 | for (; sIt != dirs.end(); ++sIt) { | 1505 | for (; sIt != dirs.end(); ++sIt) { |
1504 | addResourceDir(resType.latin1(), *sIt); | 1506 | addResourceDir(resType.latin1(), *sIt); |
1505 | } | 1507 | } |
1506 | } | 1508 | } |
1507 | } | 1509 | } |
1508 | 1510 | ||
1509 | // Process KIOSK restrictions. | 1511 | // Process KIOSK restrictions. |
1510 | config->setGroup("KDE Resource Restrictions"); | 1512 | config->setGroup("KDE Resource Restrictions"); |
1511 | entries = config->entryMap("KDE Resource Restrictions"); | 1513 | entries = config->entryMap("KDE Resource Restrictions"); |
1512 | for (it2 = entries.begin(); it2 != entries.end(); it2++) | 1514 | for (it2 = entries.begin(); it2 != entries.end(); it2++) |
1513 | { | 1515 | { |
1514 | QString key = it2.key(); | 1516 | QString key = it2.key(); |
1515 | if (!config->readBoolEntry(key, true)) | 1517 | if (!config->readBoolEntry(key, true)) |
1516 | { | 1518 | { |
1517 | d->restrictionsActive = true; | 1519 | d->restrictionsActive = true; |
1518 | d->restrictions.insert(key.latin1(), &d->restrictionsActive); // Anything will do | 1520 | d->restrictions.insert(key.latin1(), &d->restrictionsActive); // Anything will do |
1519 | dircache.remove(key.latin1()); | 1521 | dircache.remove(key.latin1()); |
1520 | } | 1522 | } |
1521 | } | 1523 | } |
1522 | */ | 1524 | */ |
1523 | // save it for future calls - that will return | 1525 | // save it for future calls - that will return |
1524 | addedCustoms = true; | 1526 | addedCustoms = true; |
1525 | config->setGroup(oldGroup); | 1527 | config->setGroup(oldGroup); |
1526 | 1528 | ||
1527 | // return true if the number of config dirs changed | 1529 | // return true if the number of config dirs changed |
1528 | return (resourceDirs("config").count() != configdirs); | 1530 | return (resourceDirs("config").count() != configdirs); |
1529 | } | 1531 | } |
1530 | 1532 | ||
1531 | QString KStandardDirs::localkdedir() const | 1533 | QString KStandardDirs::localkdedir() const |
1532 | { | 1534 | { |
1533 | // Return the prefix to use for saving | 1535 | // Return the prefix to use for saving |
1534 | return prefixes.first(); | 1536 | return prefixes.first(); |
1535 | } | 1537 | } |
1536 | 1538 | ||
1537 | QString KStandardDirs::localxdgdatadir() const | 1539 | QString KStandardDirs::localxdgdatadir() const |
1538 | { | 1540 | { |
1539 | // Return the prefix to use for saving | 1541 | // Return the prefix to use for saving |
1540 | return d->xdgdata_prefixes.first(); | 1542 | return d->xdgdata_prefixes.first(); |
1541 | } | 1543 | } |
1542 | 1544 | ||
1543 | QString KStandardDirs::localxdgconfdir() const | 1545 | QString KStandardDirs::localxdgconfdir() const |
1544 | { | 1546 | { |
1545 | // Return the prefix to use for saving | 1547 | // Return the prefix to use for saving |
1546 | return d->xdgconf_prefixes.first(); | 1548 | return d->xdgconf_prefixes.first(); |
1547 | } | 1549 | } |
1548 | 1550 | ||
1549 | void KStandardDirs::setAppDir( const QString &appDir ) | 1551 | void KStandardDirs::setAppDir( const QString &appDir ) |
1550 | { | 1552 | { |
1551 | mAppDir = appDir; | 1553 | mAppDir = appDir; |
1552 | 1554 | ||
1553 | if ( mAppDir.right( 1 ) != "/" ) | 1555 | if ( mAppDir.right( 1 ) != "/" ) |
1554 | mAppDir += "/"; | 1556 | mAppDir += "/"; |
1555 | } | 1557 | } |
1556 | 1558 | ||
1557 | QString KStandardDirs::appDir() | 1559 | QString KStandardDirs::appDir() |
1558 | { | 1560 | { |
1559 | return mAppDir; | 1561 | return mAppDir; |
1560 | } | 1562 | } |
1561 | 1563 | ||
1562 | // just to make code more readable without macros | 1564 | // just to make code more readable without macros |
1563 | QString locate( const char *type, | 1565 | QString locate( const char *type, |
1564 | const QString& filename/*US , const KInstance* inst*/ ) | 1566 | const QString& filename/*US , const KInstance* inst*/ ) |
1565 | { | 1567 | { |
1566 | //US return inst->dirs()->findResource(type, filename); | 1568 | //US return inst->dirs()->findResource(type, filename); |
1567 | return KGlobal::dirs()->findResource(type, filename); | 1569 | return KGlobal::dirs()->findResource(type, filename); |
1568 | } | 1570 | } |
1569 | 1571 | ||
1570 | QString locateLocal( const char *type, | 1572 | QString locateLocal( const char *type, |
1571 | const QString& filename/*US , const KInstance* inst*/ ) | 1573 | const QString& filename/*US , const KInstance* inst*/ ) |
1572 | { | 1574 | { |
1573 | 1575 | ||
1574 | QString path = locateLocal(type, filename, true /*US, inst*/); | 1576 | QString path = locateLocal(type, filename, true /*US, inst*/); |
1575 | 1577 | ||
1576 | 1578 | ||
1577 | /* | 1579 | /* |
1578 | static int ccc = 0; | 1580 | static int ccc = 0; |
1579 | ++ccc; | 1581 | ++ccc; |
1580 | if ( ccc > 13 ) | 1582 | if ( ccc > 13 ) |
1581 | abort(); | 1583 | abort(); |
1582 | */ | 1584 | */ |
1583 | //qDebug("locatelocal: %s" , path.latin1()); | 1585 | //qDebug("locatelocal: %s" , path.latin1()); |
1584 | return path; | 1586 | return path; |
1585 | 1587 | ||
1586 | /*US why do we put all files into one directory. It is quit complicated. | 1588 | /*US why do we put all files into one directory. It is quit complicated. |
1587 | why not staying with the original directorystructure ? | 1589 | why not staying with the original directorystructure ? |
1588 | 1590 | ||
1589 | 1591 | ||
1590 | QString escapedFilename = filename; | 1592 | QString escapedFilename = filename; |
1591 | escapedFilename.replace( QRegExp( "/" ), "_" ); | 1593 | escapedFilename.replace( QRegExp( "/" ), "_" ); |
1592 | 1594 | ||
1593 | QString path = KStandardDirs::appDir() + type + "_" + escapedFilename; | 1595 | QString path = KStandardDirs::appDir() + type + "_" + escapedFilename; |
1594 | 1596 | ||
1595 | kdDebug() << "locate: '" << path << "'" << endl; | 1597 | kdDebug() << "locate: '" << path << "'" << endl; |
1596 | qDebug("locate: %s" , path.latin1()); | 1598 | qDebug("locate: %s" , path.latin1()); |
1597 | return path; | 1599 | return path; |
1598 | */ | 1600 | */ |
1599 | //US so my proposal is this: | 1601 | //US so my proposal is this: |
1600 | 1602 | ||
1601 | // QString escapedFilename = filename; | 1603 | // QString escapedFilename = filename; |
1602 | // escapedFilename.replace( QRegExp( "/" ), "_" ); | 1604 | // escapedFilename.replace( QRegExp( "/" ), "_" ); |
1603 | 1605 | ||
1604 | #if 0 | 1606 | #if 0 |
1605 | #ifdef _WIN32_ | 1607 | #ifdef _WIN32_ |
1606 | QString path = QDir::convertSeparators(KStandardDirs::appDir() + type + "/" + filename); | 1608 | QString path = QDir::convertSeparators(KStandardDirs::appDir() + type + "/" + filename); |
1607 | #else | 1609 | #else |
1608 | QString path = KStandardDirs::appDir() + type + "/" + filename; | 1610 | QString path = KStandardDirs::appDir() + type + "/" + filename; |
1609 | #endif | 1611 | #endif |
1610 | 1612 | ||
1611 | //US Create the containing dir if needed | 1613 | //US Create the containing dir if needed |
1612 | QFileInfo fi ( path ); | 1614 | QFileInfo fi ( path ); |
1613 | 1615 | ||
1614 | // QString dir=pathurl.directory(); | 1616 | // QString dir=pathurl.directory(); |
1615 | //QMessageBox::information( 0,"path", path, 1 ); | 1617 | //QMessageBox::information( 0,"path", path, 1 ); |
1616 | 1618 | ||
1617 | #ifdef _WIN32_ | 1619 | #ifdef _WIN32_ |
1618 | KStandardDirs::makeDir(path); | 1620 | KStandardDirs::makeDir(path); |
1619 | #else | 1621 | #else |
1620 | KStandardDirs::makeDir(fi.dirPath( true )); | 1622 | KStandardDirs::makeDir(fi.dirPath( true )); |
1621 | #endif | 1623 | #endif |
1622 | 1624 | ||
1623 | qDebug("locate22: %s" , path.latin1()); | 1625 | qDebug("locate22: %s" , path.latin1()); |
1624 | return path; | 1626 | return path; |
1625 | 1627 | ||
1626 | #endif | 1628 | #endif |
1627 | 1629 | ||
1628 | } | 1630 | } |
1629 | 1631 | ||
1630 | QString locateLocal( const char *type, | 1632 | QString locateLocal( const char *type, |
1631 | const QString& filename, bool createDir/*US , const KInstance* inst*/ ) | 1633 | const QString& filename, bool createDir/*US , const KInstance* inst*/ ) |
1632 | { | 1634 | { |
1633 | // try to find slashes. If there are some, we have to | 1635 | // try to find slashes. If there are some, we have to |
1634 | // create the subdir first | 1636 | // create the subdir first |
1635 | int slash = filename.findRev('/')+1; | 1637 | int slash = filename.findRev('/')+1; |
1636 | if (!slash) // only one filename | 1638 | if (!slash) // only one filename |
1637 | //USreturn inst->dirs()->saveLocation(type, QString::null, createDir) + filename; | 1639 | //USreturn inst->dirs()->saveLocation(type, QString::null, createDir) + filename; |
1638 | return KGlobal::dirs()->saveLocation(type, QString::null, createDir) + filename; | 1640 | return KGlobal::dirs()->saveLocation(type, QString::null, createDir) + filename; |
1639 | 1641 | ||
1640 | // split path from filename | 1642 | // split path from filename |
1641 | QString dir = filename.left(slash); | 1643 | QString dir = filename.left(slash); |
1642 | QString file = filename.mid(slash); | 1644 | QString file = filename.mid(slash); |
1643 | //US return inst->dirs()->saveLocation(type, dir, createDir) + file; | 1645 | //US return inst->dirs()->saveLocation(type, dir, createDir) + file; |
1644 | return KGlobal::dirs()->saveLocation(type, dir, createDir) + file; | 1646 | return KGlobal::dirs()->saveLocation(type, dir, createDir) + file; |
1645 | 1647 | ||
1646 | // *************************************************************** | 1648 | // *************************************************************** |
1647 | #if 0 | 1649 | #if 0 |
1648 | 1650 | ||
1649 | /*US why do we put all files into one directory. It is quit complicated. | 1651 | /*US why do we put all files into one directory. It is quit complicated. |
1650 | why not staying with the original directorystructure ? | 1652 | why not staying with the original directorystructure ? |
1651 | 1653 | ||
1652 | 1654 | ||
1653 | QString escapedFilename = filename; | 1655 | QString escapedFilename = filename; |
1654 | escapedFilename.replace( QRegExp( "/" ), "_" ); | 1656 | escapedFilename.replace( QRegExp( "/" ), "_" ); |
1655 | 1657 | ||
1656 | QString path = KStandardDirs::appDir() + type + "_" + escapedFilename; | 1658 | QString path = KStandardDirs::appDir() + type + "_" + escapedFilename; |
1657 | 1659 | ||
1658 | kdDebug() << "locate: '" << path << "'" << endl; | 1660 | kdDebug() << "locate: '" << path << "'" << endl; |
1659 | qDebug("locate: %s" , path.latin1()); | 1661 | qDebug("locate: %s" , path.latin1()); |
1660 | return path; | 1662 | return path; |
1661 | */ | 1663 | */ |
1662 | //US so my proposal is this: | 1664 | //US so my proposal is this: |
1663 | 1665 | ||
1664 | // QString escapedFilename = filename; | 1666 | // QString escapedFilename = filename; |
1665 | // escapedFilename.replace( QRegExp( "/" ), "_" ); | 1667 | // escapedFilename.replace( QRegExp( "/" ), "_" ); |
1666 | 1668 | ||
1667 | #ifdef _WIN32_ | 1669 | #ifdef _WIN32_ |
1668 | QString path = QDir::convertSeparators(KStandardDirs::appDir() + type + "/" + filename); | 1670 | QString path = QDir::convertSeparators(KStandardDirs::appDir() + type + "/" + filename); |
1669 | #else | 1671 | #else |
1670 | QString path = KStandardDirs::appDir() + type + "/" + filename; | 1672 | QString path = KStandardDirs::appDir() + type + "/" + filename; |
1671 | #endif | 1673 | #endif |
1672 | 1674 | ||
1673 | //US Create the containing dir if needed | 1675 | //US Create the containing dir if needed |
1674 | KURL pathurl; | 1676 | KURL pathurl; |
1675 | pathurl.setPath(path); | 1677 | pathurl.setPath(path); |
1676 | QString dir=pathurl.directory(); | 1678 | QString dir=pathurl.directory(); |
1677 | //QMessageBox::information( 0,"path", path, 1 ); | 1679 | //QMessageBox::information( 0,"path", path, 1 ); |
1678 | #ifdef _WIN32_ | 1680 | #ifdef _WIN32_ |
1679 | KStandardDirs::makeDir(path); | 1681 | KStandardDirs::makeDir(path); |
1680 | #else | 1682 | #else |
1681 | KStandardDirs::makeDir(dir); | 1683 | KStandardDirs::makeDir(dir); |
1682 | #endif | 1684 | #endif |
1683 | 1685 | ||
1684 | return path; | 1686 | return path; |
1685 | #endif | 1687 | #endif |
1686 | } | 1688 | } |
diff --git a/microkde/kdecore/kstandarddirs.h b/microkde/kdecore/kstandarddirs.h index bee864e..901384e 100644 --- a/microkde/kdecore/kstandarddirs.h +++ b/microkde/kdecore/kstandarddirs.h | |||
@@ -1,681 +1,685 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of the KDE libraries | 2 | This file is part of the KDE libraries |
3 | Copyright (C) 1999 Sirtaj Singh Kang <taj@kde.org> | 3 | Copyright (C) 1999 Sirtaj Singh Kang <taj@kde.org> |
4 | Stephan Kulow <coolo@kde.org> | 4 | Stephan Kulow <coolo@kde.org> |
5 | Waldo Bastian <bastian@kde.org> | 5 | Waldo Bastian <bastian@kde.org> |
6 | 6 | ||
7 | This library is free software; you can redistribute it and/or | 7 | This library is free software; you can redistribute it and/or |
8 | modify it under the terms of the GNU Library General Public | 8 | modify it under the terms of the GNU Library General Public |
9 | License as published by the Free Software Foundation; either | 9 | License as published by the Free Software Foundation; either |
10 | version 2 of the License, or (at your option) any later version. | 10 | version 2 of the License, or (at your option) any later version. |
11 | 11 | ||
12 | This library is distributed in the hope that it will be useful, | 12 | This library is distributed in the hope that it will be useful, |
13 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 13 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 14 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
15 | Library General Public License for more details. | 15 | Library General Public License for more details. |
16 | 16 | ||
17 | You should have received a copy of the GNU Library General Public License | 17 | You should have received a copy of the GNU Library General Public License |
18 | along with this library; see the file COPYING.LIB. If not, write to | 18 | along with this library; see the file COPYING.LIB. If not, write to |
19 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 19 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
20 | Boston, MA 02111-1307, USA. | 20 | Boston, MA 02111-1307, USA. |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #ifndef SSK_KSTDDIRS_H | 23 | #ifndef SSK_KSTDDIRS_H |
24 | #define SSK_KSTDDIRS_H | 24 | #define SSK_KSTDDIRS_H |
25 | 25 | ||
26 | #include <qstring.h> | 26 | #include <qstring.h> |
27 | #include <qdict.h> | 27 | #include <qdict.h> |
28 | #include <qstringlist.h> | 28 | #include <qstringlist.h> |
29 | #include <kglobal.h> | 29 | #include <kglobal.h> |
30 | 30 | ||
31 | class KConfig; | 31 | class KConfig; |
32 | class KStandardDirsPrivate; | 32 | class KStandardDirsPrivate; |
33 | 33 | ||
34 | 34 | ||
35 | /** | 35 | /** |
36 | * @short Site-independent access to standard KDE directories. | 36 | * @short Site-independent access to standard KDE directories. |
37 | * @author Stephan Kulow <coolo@kde.org> and Sirtaj Singh Kang <taj@kde.org> | 37 | * @author Stephan Kulow <coolo@kde.org> and Sirtaj Singh Kang <taj@kde.org> |
38 | * @version $Id$ | 38 | * @version $Id$ |
39 | * | 39 | * |
40 | * This is one of the most central classes in kdelibs as | 40 | * This is one of the most central classes in kdelibs as |
41 | * it provides a basic service: It knows where the files | 41 | * it provides a basic service: It knows where the files |
42 | * reside on the user's hard disk. And it's meant to be the | 42 | * reside on the user's hard disk. And it's meant to be the |
43 | * only one that knows -- to make the real location as | 43 | * only one that knows -- to make the real location as |
44 | * transparent as possible to both the user and the applications. | 44 | * transparent as possible to both the user and the applications. |
45 | * | 45 | * |
46 | * To this end it insulates the application from all information | 46 | * To this end it insulates the application from all information |
47 | * and applications always refer to a file with a resource type | 47 | * and applications always refer to a file with a resource type |
48 | * (e.g. icon) and a filename (e.g. khexdit.xpm). In an ideal world | 48 | * (e.g. icon) and a filename (e.g. khexdit.xpm). In an ideal world |
49 | * the application would make no assumption where this file is and | 49 | * the application would make no assumption where this file is and |
50 | * leave it up to @ref KStandardDirs::findResource("apps", "Home.desktop") | 50 | * leave it up to @ref KStandardDirs::findResource("apps", "Home.desktop") |
51 | * to apply this knowledge to return /opt/kde/share/applnk/Home.desktop | 51 | * to apply this knowledge to return /opt/kde/share/applnk/Home.desktop |
52 | * or ::locate("data", "kgame/background.jpg") to return | 52 | * or ::locate("data", "kgame/background.jpg") to return |
53 | * /opt/kde/share/apps/kgame/background.jpg | 53 | * /opt/kde/share/apps/kgame/background.jpg |
54 | * | 54 | * |
55 | * The main idea behind KStandardDirs is that there are several | 55 | * The main idea behind KStandardDirs is that there are several |
56 | * toplevel prefixes below which the files lie. One of these prefixes is | 56 | * toplevel prefixes below which the files lie. One of these prefixes is |
57 | * the one where the user installed kdelibs, one is where the | 57 | * the one where the user installed kdelibs, one is where the |
58 | * application was installed, and one is $HOME/.kde, but there | 58 | * application was installed, and one is $HOME/.kde, but there |
59 | * may be even more. Under these prefixes there are several well | 59 | * may be even more. Under these prefixes there are several well |
60 | * defined suffixes where specific resource types are to be found. | 60 | * defined suffixes where specific resource types are to be found. |
61 | * For example, for the resource type "html" the suffixes could be | 61 | * For example, for the resource type "html" the suffixes could be |
62 | * share/doc/HTML and share/doc/kde/HTML. | 62 | * share/doc/HTML and share/doc/kde/HTML. |
63 | * So the search algorithm basicly appends to each prefix each registered | 63 | * So the search algorithm basicly appends to each prefix each registered |
64 | * suffix and tries to locate the file there. | 64 | * suffix and tries to locate the file there. |
65 | * To make the thing even more complex, it's also possible to register | 65 | * To make the thing even more complex, it's also possible to register |
66 | * absolute paths that KStandardDirs looks up after not finding anything | 66 | * absolute paths that KStandardDirs looks up after not finding anything |
67 | * in the former steps. They can be useful if the user wants to provide | 67 | * in the former steps. They can be useful if the user wants to provide |
68 | * specific directories that aren't in his $HOME/.kde directory for, | 68 | * specific directories that aren't in his $HOME/.kde directory for, |
69 | * for example, icons. | 69 | * for example, icons. |
70 | * | 70 | * |
71 | * @sect Standard resources that kdelibs allocates are: | 71 | * @sect Standard resources that kdelibs allocates are: |
72 | * | 72 | * |
73 | * @li apps - Applications menu (.desktop files). | 73 | * @li apps - Applications menu (.desktop files). |
74 | * @li cache - Cached information (e.g. favicons, web-pages) | 74 | * @li cache - Cached information (e.g. favicons, web-pages) |
75 | * @li cgi - CGIs to run from kdehelp. | 75 | * @li cgi - CGIs to run from kdehelp. |
76 | * @li config - Configuration files. | 76 | * @li config - Configuration files. |
77 | * @li data - Where applications store data. | 77 | * @li data - Where applications store data. |
78 | * @li exe - Executables in $prefix/bin. @ref findExe() for a function that takes $PATH into account. | 78 | * @li exe - Executables in $prefix/bin. @ref findExe() for a function that takes $PATH into account. |
79 | * @li html - HTML documentation. | 79 | * @li html - HTML documentation. |
80 | * @li icon - Icons, see @ref KIconLoader. | 80 | * @li icon - Icons, see @ref KIconLoader. |
81 | * @li lib - Libraries. | 81 | * @li lib - Libraries. |
82 | * @li locale - Translation files for @ref KLocale. | 82 | * @li locale - Translation files for @ref KLocale. |
83 | * @li mime - Mime types. | 83 | * @li mime - Mime types. |
84 | * @li module - Module (dynamically loaded library). | 84 | * @li module - Module (dynamically loaded library). |
85 | * @li qtplugins - Qt plugins (dynamically loaded objects for Qt) | 85 | * @li qtplugins - Qt plugins (dynamically loaded objects for Qt) |
86 | * @li services - Services. | 86 | * @li services - Services. |
87 | * @li servicetypes - Service types. | 87 | * @li servicetypes - Service types. |
88 | * @li scripts - Application scripting additions. | 88 | * @li scripts - Application scripting additions. |
89 | * @li sound - Application sounds. | 89 | * @li sound - Application sounds. |
90 | * @li templates - Templates | 90 | * @li templates - Templates |
91 | * @li wallpaper - Wallpapers. | 91 | * @li wallpaper - Wallpapers. |
92 | * @li tmp - Temporary files (specfic for both current host and current user) | 92 | * @li tmp - Temporary files (specfic for both current host and current user) |
93 | * @li socket - UNIX Sockets (specific for both current host and current user) | 93 | * @li socket - UNIX Sockets (specific for both current host and current user) |
94 | * | 94 | * |
95 | * A type that is added by the class @ref KApplication if you use it, is | 95 | * A type that is added by the class @ref KApplication if you use it, is |
96 | * appdata. This one makes the use of the type data a bit easier as it | 96 | * appdata. This one makes the use of the type data a bit easier as it |
97 | * appends the name of the application. | 97 | * appends the name of the application. |
98 | * So while you had to ::locate("data", "appname/filename") so you can | 98 | * So while you had to ::locate("data", "appname/filename") so you can |
99 | * also write ::locate("appdata", "filename") if your KApplication instance | 99 | * also write ::locate("appdata", "filename") if your KApplication instance |
100 | * is called "appname" (as set via KApplication's constructor or KAboutData, if | 100 | * is called "appname" (as set via KApplication's constructor or KAboutData, if |
101 | * you use the global KStandardDirs object @ref KGlobal::dirs()). | 101 | * you use the global KStandardDirs object @ref KGlobal::dirs()). |
102 | * Please note though that you cannot use the "appdata" | 102 | * Please note though that you cannot use the "appdata" |
103 | * type if you intend to use it in an applet for Kicker because 'appname' would | 103 | * type if you intend to use it in an applet for Kicker because 'appname' would |
104 | * be "Kicker" instead of the applet's name. Therefore, for applets, you've got | 104 | * be "Kicker" instead of the applet's name. Therefore, for applets, you've got |
105 | * to work around this by using ::locate("data", "appletname/filename"). | 105 | * to work around this by using ::locate("data", "appletname/filename"). |
106 | * | 106 | * |
107 | * @sect KStandardDirs supports the following environment variables: | 107 | * @sect KStandardDirs supports the following environment variables: |
108 | * | 108 | * |
109 | * @li KDEDIRS: This may set an additional number of directory prefixes to | 109 | * @li KDEDIRS: This may set an additional number of directory prefixes to |
110 | * search for resources. The directories should be seperated | 110 | * search for resources. The directories should be seperated |
111 | * by ':'. The directories are searched in the order they are | 111 | * by ':'. The directories are searched in the order they are |
112 | * specified. | 112 | * specified. |
113 | * @li KDEDIR: Used for backwards compatibility. As KDEDIRS but only a single | 113 | * @li KDEDIR: Used for backwards compatibility. As KDEDIRS but only a single |
114 | * directory may be specified. If KDEDIRS is set KDEDIR is | 114 | * directory may be specified. If KDEDIRS is set KDEDIR is |
115 | * ignored. | 115 | * ignored. |
116 | * @li KDEHOME: The directory where changes are saved to. This directory is | 116 | * @li KDEHOME: The directory where changes are saved to. This directory is |
117 | * used to search for resources first. If KDEHOME is not | 117 | * used to search for resources first. If KDEHOME is not |
118 | * specified it defaults to "$HOME/.kde" | 118 | * specified it defaults to "$HOME/.kde" |
119 | * @li KDEROOTHOME: Like KDEHOME, but used for the root user. | 119 | * @li KDEROOTHOME: Like KDEHOME, but used for the root user. |
120 | * If KDEROOTHOME is not set it defaults to the .kde directory in the | 120 | * If KDEROOTHOME is not set it defaults to the .kde directory in the |
121 | * home directory of root, usually "/root/.kde". | 121 | * home directory of root, usually "/root/.kde". |
122 | * Note that the setting of $HOME is ignored in this case. | 122 | * Note that the setting of $HOME is ignored in this case. |
123 | * | 123 | * |
124 | * @see KGlobalSettings | 124 | * @see KGlobalSettings |
125 | */ | 125 | */ |
126 | class KStandardDirs | 126 | class KStandardDirs |
127 | { | 127 | { |
128 | public: | 128 | public: |
129 | /** | 129 | /** |
130 | * KStandardDirs' constructor. It just initializes the caches. | 130 | * KStandardDirs' constructor. It just initializes the caches. |
131 | **/ | 131 | **/ |
132 | KStandardDirs( ); | 132 | KStandardDirs( ); |
133 | 133 | ||
134 | /** | 134 | /** |
135 | * KStandardDirs' destructor. | 135 | * KStandardDirs' destructor. |
136 | */ | 136 | */ |
137 | virtual ~KStandardDirs(); | 137 | virtual ~KStandardDirs(); |
138 | 138 | ||
139 | /** | 139 | /** |
140 | * Adds another search dir to front of the @p fsstnd list. | 140 | * Adds another search dir to front of the @p fsstnd list. |
141 | * | 141 | * |
142 | * @li When compiling kdelibs, the prefix is added to this. | 142 | * @li When compiling kdelibs, the prefix is added to this. |
143 | * @li KDEDIRS or KDEDIR is taking into account | 143 | * @li KDEDIRS or KDEDIR is taking into account |
144 | * @li Additional dirs may be loaded from kdeglobals. | 144 | * @li Additional dirs may be loaded from kdeglobals. |
145 | * | 145 | * |
146 | * @param dir The directory to append relative paths to. | 146 | * @param dir The directory to append relative paths to. |
147 | */ | 147 | */ |
148 | void addPrefix( const QString& dir ); | 148 | void addPrefix( const QString& dir ); |
149 | 149 | ||
150 | /** | 150 | /** |
151 | * Adds another search dir to front of the XDG_CONFIG_XXX list | 151 | * Adds another search dir to front of the XDG_CONFIG_XXX list |
152 | * of prefixes. | 152 | * of prefixes. |
153 | * This prefix is only used for resources that start with "xdgconf-" | 153 | * This prefix is only used for resources that start with "xdgconf-" |
154 | * | 154 | * |
155 | * @param dir The directory to append relative paths to. | 155 | * @param dir The directory to append relative paths to. |
156 | */ | 156 | */ |
157 | void addXdgConfigPrefix( const QString& dir ); | 157 | void addXdgConfigPrefix( const QString& dir ); |
158 | 158 | ||
159 | /** | 159 | /** |
160 | * Adds another search dir to front of the XDG_DATA_XXX list | 160 | * Adds another search dir to front of the XDG_DATA_XXX list |
161 | * of prefixes. | 161 | * of prefixes. |
162 | * This prefix is only used for resources that start with "xdgdata-" | 162 | * This prefix is only used for resources that start with "xdgdata-" |
163 | * | 163 | * |
164 | * @param dir The directory to append relative paths to. | 164 | * @param dir The directory to append relative paths to. |
165 | */ | 165 | */ |
166 | void addXdgDataPrefix( const QString& dir ); | 166 | void addXdgDataPrefix( const QString& dir ); |
167 | 167 | ||
168 | /** | 168 | /** |
169 | * Adds suffixes for types. | 169 | * Adds suffixes for types. |
170 | * | 170 | * |
171 | * You may add as many as you need, but it is advised that there | 171 | * You may add as many as you need, but it is advised that there |
172 | * is exactly one to make writing definite. | 172 | * is exactly one to make writing definite. |
173 | * All basic types (@ref kde_default) are added by @ref addKDEDefaults(), | 173 | * All basic types (@ref kde_default) are added by @ref addKDEDefaults(), |
174 | * but for those you can add more relative paths as well. | 174 | * but for those you can add more relative paths as well. |
175 | * | 175 | * |
176 | * The later a suffix is added, the higher its priority. Note, that the | 176 | * The later a suffix is added, the higher its priority. Note, that the |
177 | * suffix should end with / but doesn't have to start with one (as prefixes | 177 | * suffix should end with / but doesn't have to start with one (as prefixes |
178 | * should end with one). So adding a suffix for app_pics would look | 178 | * should end with one). So adding a suffix for app_pics would look |
179 | * like KGlobal::dirs()->addResourceType("app_pics", "share/app/pics"); | 179 | * like KGlobal::dirs()->addResourceType("app_pics", "share/app/pics"); |
180 | * | 180 | * |
181 | * @param type Specifies a short descriptive string to access | 181 | * @param type Specifies a short descriptive string to access |
182 | * files of this type. | 182 | * files of this type. |
183 | * @param relativename Specifies a directory relative to the root | 183 | * @param relativename Specifies a directory relative to the root |
184 | * of the KFSSTND. | 184 | * of the KFSSTND. |
185 | * @return true if successful, false otherwise. | 185 | * @return true if successful, false otherwise. |
186 | */ | 186 | */ |
187 | bool addResourceType( const char *type, | 187 | bool addResourceType( const char *type, |
188 | const QString& relativename ); | 188 | const QString& relativename ); |
189 | 189 | ||
190 | /** | 190 | /** |
191 | * Adds absolute path at the end of the search path for | 191 | * Adds absolute path at the end of the search path for |
192 | * particular types (for example in case of icons where | 192 | * particular types (for example in case of icons where |
193 | * the user specifies extra paths). | 193 | * the user specifies extra paths). |
194 | * | 194 | * |
195 | * You shouldn't need this | 195 | * You shouldn't need this |
196 | * function in 99% of all cases besides adding user-given | 196 | * function in 99% of all cases besides adding user-given |
197 | * paths. | 197 | * paths. |
198 | * | 198 | * |
199 | * @param type Specifies a short descriptive string to access files | 199 | * @param type Specifies a short descriptive string to access files |
200 | * of this type. | 200 | * of this type. |
201 | * @param absdir Points to directory where to look for this specific | 201 | * @param absdir Points to directory where to look for this specific |
202 | * type. Non-existant directories may be saved but pruned. | 202 | * type. Non-existant directories may be saved but pruned. |
203 | * @return true if successful, false otherwise. | 203 | * @return true if successful, false otherwise. |
204 | */ | 204 | */ |
205 | bool addResourceDir( const char *type, | 205 | bool addResourceDir( const char *type, |
206 | const QString& absdir); | 206 | const QString& absdir); |
207 | 207 | ||
208 | /** | 208 | /** |
209 | * Tries to find a resource in the following order: | 209 | * Tries to find a resource in the following order: |
210 | * @li All PREFIX/\<relativename> paths (most recent first). | 210 | * @li All PREFIX/\<relativename> paths (most recent first). |
211 | * @li All absolute paths (most recent first). | 211 | * @li All absolute paths (most recent first). |
212 | * | 212 | * |
213 | * The filename should be a filename relative to the base dir | 213 | * The filename should be a filename relative to the base dir |
214 | * for resources. So is a way to get the path to libkdecore.la | 214 | * for resources. So is a way to get the path to libkdecore.la |
215 | * to findResource("lib", "libkdecore.la"). KStandardDirs will | 215 | * to findResource("lib", "libkdecore.la"). KStandardDirs will |
216 | * then look into the subdir lib of all elements of all prefixes | 216 | * then look into the subdir lib of all elements of all prefixes |
217 | * ($KDEDIRS) for a file libkdecore.la and return the path to | 217 | * ($KDEDIRS) for a file libkdecore.la and return the path to |
218 | * the first one it finds (e.g. /opt/kde/lib/libkdecore.la) | 218 | * the first one it finds (e.g. /opt/kde/lib/libkdecore.la) |
219 | * | 219 | * |
220 | * @param type The type of the wanted resource | 220 | * @param type The type of the wanted resource |
221 | * @param filename A relative filename of the resource. | 221 | * @param filename A relative filename of the resource. |
222 | * | 222 | * |
223 | * @return A full path to the filename specified in the second | 223 | * @return A full path to the filename specified in the second |
224 | * argument, or QString::null if not found. | 224 | * argument, or QString::null if not found. |
225 | */ | 225 | */ |
226 | QString findResource( const char *type, | 226 | QString findResource( const char *type, |
227 | const QString& filename ) const; | 227 | const QString& filename ) const; |
228 | 228 | ||
229 | /** | 229 | /** |
230 | * Checks whether a resource is restricted as part of the KIOSK | 230 | * Checks whether a resource is restricted as part of the KIOSK |
231 | * framework. When a resource is restricted it means that user- | 231 | * framework. When a resource is restricted it means that user- |
232 | * specific files in the resource are ignored. | 232 | * specific files in the resource are ignored. |
233 | * | 233 | * |
234 | * E.g. by restricting the "wallpaper" resource, only system-wide | 234 | * E.g. by restricting the "wallpaper" resource, only system-wide |
235 | * installed wallpapers will be found by this class. Wallpapers | 235 | * installed wallpapers will be found by this class. Wallpapers |
236 | * installed under the $KDEHOME directory will be ignored. | 236 | * installed under the $KDEHOME directory will be ignored. |
237 | * | 237 | * |
238 | * @param type The type of the resource to check | 238 | * @param type The type of the resource to check |
239 | * @param relPath A relative path in the resource. | 239 | * @param relPath A relative path in the resource. |
240 | * | 240 | * |
241 | * @return True if the resource is restricted. | 241 | * @return True if the resource is restricted. |
242 | * @since 3.1 | 242 | * @since 3.1 |
243 | */ | 243 | */ |
244 | bool isRestrictedResource( const char *type, | 244 | bool isRestrictedResource( const char *type, |
245 | const QString& relPath=QString::null ) const; | 245 | const QString& relPath=QString::null ) const; |
246 | 246 | ||
247 | /** | 247 | /** |
248 | * Returns a number that identifies this version of the resource. | 248 | * Returns a number that identifies this version of the resource. |
249 | * When a change is made to the resource this number will change. | 249 | * When a change is made to the resource this number will change. |
250 | * | 250 | * |
251 | * @param type The type of the wanted resource | 251 | * @param type The type of the wanted resource |
252 | * @param filename A relative filename of the resource. | 252 | * @param filename A relative filename of the resource. |
253 | * @param deep If true, all resources are taken into account | 253 | * @param deep If true, all resources are taken into account |
254 | * otherwise only the one returned by findResource(). | 254 | * otherwise only the one returned by findResource(). |
255 | * | 255 | * |
256 | * @return A number identifying the current version of the | 256 | * @return A number identifying the current version of the |
257 | * resource. | 257 | * resource. |
258 | */ | 258 | */ |
259 | /*US | 259 | /*US |
260 | Q_UINT32 calcResourceHash( const char *type, | 260 | Q_UINT32 calcResourceHash( const char *type, |
261 | const QString& filename, bool deep) const; | 261 | const QString& filename, bool deep) const; |
262 | */ | 262 | */ |
263 | /** | 263 | /** |
264 | * Tries to find all directories whose names consist of the | 264 | * Tries to find all directories whose names consist of the |
265 | * specified type and a relative path. So would | 265 | * specified type and a relative path. So would |
266 | * findDirs("apps", "Settings") return | 266 | * findDirs("apps", "Settings") return |
267 | * @li /opt/kde/share/applnk/Settings/ | 267 | * @li /opt/kde/share/applnk/Settings/ |
268 | * @li /home/joe/.kde/share/applnk/Settings/ | 268 | * @li /home/joe/.kde/share/applnk/Settings/ |
269 | * | 269 | * |
270 | * Note that it appends / to the end of the directories, | 270 | * Note that it appends / to the end of the directories, |
271 | * so you can use this right away as directory names. | 271 | * so you can use this right away as directory names. |
272 | * | 272 | * |
273 | * @param type The type of the base directory. | 273 | * @param type The type of the base directory. |
274 | * @param reldir Relative directory. | 274 | * @param reldir Relative directory. |
275 | * | 275 | * |
276 | * @return A list of matching directories, or an empty | 276 | * @return A list of matching directories, or an empty |
277 | * list if the resource specified is not found. | 277 | * list if the resource specified is not found. |
278 | */ | 278 | */ |
279 | QStringList findDirs( const char *type, | 279 | QStringList findDirs( const char *type, |
280 | const QString& reldir ) const; | 280 | const QString& reldir ) const; |
281 | 281 | ||
282 | /** | 282 | /** |
283 | * Tries to find the directory the file is in. | 283 | * Tries to find the directory the file is in. |
284 | * It works the same as @ref findResource(), but it doesn't | 284 | * It works the same as @ref findResource(), but it doesn't |
285 | * return the filename but the name of the directory. | 285 | * return the filename but the name of the directory. |
286 | * | 286 | * |
287 | * This way the application can access a couple of files | 287 | * This way the application can access a couple of files |
288 | * that have been installed into the same directory without | 288 | * that have been installed into the same directory without |
289 | * having to look for each file. | 289 | * having to look for each file. |
290 | * | 290 | * |
291 | * findResourceDir("lib", "libkdecore.la") would return the | 291 | * findResourceDir("lib", "libkdecore.la") would return the |
292 | * path of the subdir libkdecore.la is found first in | 292 | * path of the subdir libkdecore.la is found first in |
293 | * (e.g. /opt/kde/lib/) | 293 | * (e.g. /opt/kde/lib/) |
294 | * | 294 | * |
295 | * @param type The type of the wanted resource | 295 | * @param type The type of the wanted resource |
296 | * @param filename A relative filename of the resource. | 296 | * @param filename A relative filename of the resource. |
297 | * @return The directory where the file specified in the second | 297 | * @return The directory where the file specified in the second |
298 | * argument is located, or QString::null if the type | 298 | * argument is located, or QString::null if the type |
299 | * of resource specified is unknown or the resource | 299 | * of resource specified is unknown or the resource |
300 | * cannot be found. | 300 | * cannot be found. |
301 | */ | 301 | */ |
302 | QString findResourceDir( const char *type, | 302 | QString findResourceDir( const char *type, |
303 | const QString& filename) const; | 303 | const QString& filename) const; |
304 | 304 | ||
305 | 305 | ||
306 | /** | 306 | /** |
307 | * Tries to find all resources with the specified type. | 307 | * Tries to find all resources with the specified type. |
308 | * | 308 | * |
309 | * The function will look into all specified directories | 309 | * The function will look into all specified directories |
310 | * and return all filenames in these directories. | 310 | * and return all filenames in these directories. |
311 | * | 311 | * |
312 | * @param type The type of resource to locate directories for. | 312 | * @param type The type of resource to locate directories for. |
313 | * @param filter Only accept filenames that fit to filter. The filter | 313 | * @param filter Only accept filenames that fit to filter. The filter |
314 | * may consist of an optional directory and a @ref QRegExp | 314 | * may consist of an optional directory and a @ref QRegExp |
315 | * wildcard expression. E.g. "images\*.jpg". Use QString::null | 315 | * wildcard expression. E.g. "images\*.jpg". Use QString::null |
316 | * if you do not want a filter. | 316 | * if you do not want a filter. |
317 | * @param recursive Specifies if the function should decend | 317 | * @param recursive Specifies if the function should decend |
318 | * into subdirectories. | 318 | * into subdirectories. |
319 | * @param uniq If specified, only return items which have | 319 | * @param uniq If specified, only return items which have |
320 | * unique suffixes - suppressing duplicated filenames. | 320 | * unique suffixes - suppressing duplicated filenames. |
321 | * | 321 | * |
322 | * @return A list of directories matching the resource specified, | 322 | * @return A list of directories matching the resource specified, |
323 | * or an empty list if the resource type is unknown. | 323 | * or an empty list if the resource type is unknown. |
324 | */ | 324 | */ |
325 | QStringList findAllResources( const char *type, | 325 | QStringList findAllResources( const char *type, |
326 | const QString& filter = QString::null, | 326 | const QString& filter = QString::null, |
327 | bool recursive = false, | 327 | bool recursive = false, |
328 | bool uniq = false) const; | 328 | bool uniq = false) const; |
329 | 329 | ||
330 | /** | 330 | /** |
331 | * Tries to find all resources with the specified type. | 331 | * Tries to find all resources with the specified type. |
332 | * | 332 | * |
333 | * The function will look into all specified directories | 333 | * The function will look into all specified directories |
334 | * and return all filenames (full and relative paths) in | 334 | * and return all filenames (full and relative paths) in |
335 | * these directories. | 335 | * these directories. |
336 | * | 336 | * |
337 | * @param type The type of resource to locate directories for. | 337 | * @param type The type of resource to locate directories for. |
338 | * @param filter Only accept filenames that fit to filter. The filter | 338 | * @param filter Only accept filenames that fit to filter. The filter |
339 | * may consist of an optional directory and a @ref QRegExp | 339 | * may consist of an optional directory and a @ref QRegExp |
340 | * wildcard expression. E.g. "images\*.jpg". Use QString::null | 340 | * wildcard expression. E.g. "images\*.jpg". Use QString::null |
341 | * if you do not want a filter. | 341 | * if you do not want a filter. |
342 | * @param recursive Specifies if the function should decend | 342 | * @param recursive Specifies if the function should decend |
343 | * into subdirectories. | 343 | * into subdirectories. |
344 | * @param uniq If specified, only return items which have | 344 | * @param uniq If specified, only return items which have |
345 | * unique suffixes. | 345 | * unique suffixes. |
346 | * @param list Of relative paths for the given type. | 346 | * @param list Of relative paths for the given type. |
347 | * @param relPaths The list to store the relative paths into | 347 | * @param relPaths The list to store the relative paths into |
348 | * These can be used later to ::locate() the file | 348 | * These can be used later to ::locate() the file |
349 | * | 349 | * |
350 | * @return A list of directories matching the resource specified, | 350 | * @return A list of directories matching the resource specified, |
351 | * or an empty list if the resource type is unknown. | 351 | * or an empty list if the resource type is unknown. |
352 | */ | 352 | */ |
353 | QStringList findAllResources( const char *type, | 353 | QStringList findAllResources( const char *type, |
354 | const QString& filter, | 354 | const QString& filter, |
355 | bool recursive, | 355 | bool recursive, |
356 | bool uniq, | 356 | bool uniq, |
357 | QStringList &relPaths) const; | 357 | QStringList &relPaths) const; |
358 | 358 | ||
359 | /** | 359 | /** |
360 | * Finds the executable in the system path. | 360 | * Finds the executable in the system path. |
361 | * | 361 | * |
362 | * A valid executable must | 362 | * A valid executable must |
363 | * be a file and have its executable bit set. | 363 | * be a file and have its executable bit set. |
364 | * | 364 | * |
365 | * @param appname The name of the executable file for which to search. | 365 | * @param appname The name of the executable file for which to search. |
366 | * @param pathstr The path which will be searched. If this is | 366 | * @param pathstr The path which will be searched. If this is |
367 | * null (default), the $PATH environment variable will | 367 | * null (default), the $PATH environment variable will |
368 | * be searched. | 368 | * be searched. |
369 | * @param ignoreExecBitIf true, an existing file will be returned | 369 | * @param ignoreExecBitIf true, an existing file will be returned |
370 | * even if its executable bit is not set. | 370 | * even if its executable bit is not set. |
371 | * | 371 | * |
372 | * @return The path of the executable. If it was not found, | 372 | * @return The path of the executable. If it was not found, |
373 | * it will return QString::null. | 373 | * it will return QString::null. |
374 | * @see findAllExe() | 374 | * @see findAllExe() |
375 | */ | 375 | */ |
376 | /*US | 376 | /*US |
377 | static QString findExe( const QString& appname, | 377 | static QString findExe( const QString& appname, |
378 | const QString& pathstr=QString::null, | 378 | const QString& pathstr=QString::null, |
379 | bool ignoreExecBit=false ); | 379 | bool ignoreExecBit=false ); |
380 | */ | 380 | */ |
381 | 381 | ||
382 | /** | 382 | /** |
383 | * Finds all occurences of an executable in the system path. | 383 | * Finds all occurences of an executable in the system path. |
384 | * | 384 | * |
385 | * @param listWill be filled with the pathnames of all the | 385 | * @param listWill be filled with the pathnames of all the |
386 | * executables found. Will be empty if the executable | 386 | * executables found. Will be empty if the executable |
387 | * was not found. | 387 | * was not found. |
388 | * @param appnameThe name of the executable for which to | 388 | * @param appnameThe name of the executable for which to |
389 | * search. | 389 | * search. |
390 | * @param pathstrThe path list which will be searched. If this | 390 | * @param pathstrThe path list which will be searched. If this |
391 | * is 0 (default), the $PATH environment variable will | 391 | * is 0 (default), the $PATH environment variable will |
392 | * be searched. | 392 | * be searched. |
393 | * @param ignoreExecBit If true, an existing file will be returned | 393 | * @param ignoreExecBit If true, an existing file will be returned |
394 | * even if its executable bit is not set. | 394 | * even if its executable bit is not set. |
395 | * | 395 | * |
396 | * @return The number of executables found, 0 if none were found. | 396 | * @return The number of executables found, 0 if none were found. |
397 | * | 397 | * |
398 | * @seefindExe() | 398 | * @seefindExe() |
399 | */ | 399 | */ |
400 | static int findAllExe( QStringList& list, const QString& appname, | 400 | static int findAllExe( QStringList& list, const QString& appname, |
401 | const QString& pathstr=QString::null, | 401 | const QString& pathstr=QString::null, |
402 | bool ignoreExecBit=false ); | 402 | bool ignoreExecBit=false ); |
403 | 403 | ||
404 | /** | 404 | /** |
405 | * This function adds the defaults that are used by the current | 405 | * This function adds the defaults that are used by the current |
406 | * KDE version. | 406 | * KDE version. |
407 | * | 407 | * |
408 | * It's a series of @ref addResourceTypes() | 408 | * It's a series of @ref addResourceTypes() |
409 | * and @ref addPrefix() calls. | 409 | * and @ref addPrefix() calls. |
410 | * You normally wouldn't call this function because it's called | 410 | * You normally wouldn't call this function because it's called |
411 | * for you from @ref KGlobal. | 411 | * for you from @ref KGlobal. |
412 | */ | 412 | */ |
413 | void addKDEDefaults(); | 413 | void addKDEDefaults(); |
414 | 414 | ||
415 | /** | 415 | /** |
416 | * Reads customized entries out of the given config object and add | 416 | * Reads customized entries out of the given config object and add |
417 | * them via @ref addResourceDirs(). | 417 | * them via @ref addResourceDirs(). |
418 | * | 418 | * |
419 | * @param config The object the entries are read from. This should | 419 | * @param config The object the entries are read from. This should |
420 | * contain global config files | 420 | * contain global config files |
421 | * @return true if new config paths have been added | 421 | * @return true if new config paths have been added |
422 | * from @p config. | 422 | * from @p config. |
423 | **/ | 423 | **/ |
424 | bool addCustomized(KConfig *config); | 424 | bool addCustomized(KConfig *config); |
425 | 425 | ||
426 | /** | 426 | /** |
427 | * This function is used internally by almost all other function as | 427 | * This function is used internally by almost all other function as |
428 | * it serves and fills the directories cache. | 428 | * it serves and fills the directories cache. |
429 | * | 429 | * |
430 | * @param type The type of resource | 430 | * @param type The type of resource |
431 | * @return The list of possible directories for the specified @p type. | 431 | * @return The list of possible directories for the specified @p type. |
432 | * The function updates the cache if possible. If the resource | 432 | * The function updates the cache if possible. If the resource |
433 | * type specified is unknown, it will return an empty list. | 433 | * type specified is unknown, it will return an empty list. |
434 | * Note, that the directories are assured to exist beside the save | 434 | * Note, that the directories are assured to exist beside the save |
435 | * location, which may not exist, but is returned anyway. | 435 | * location, which may not exist, but is returned anyway. |
436 | */ | 436 | */ |
437 | QStringList resourceDirs(const char *type) const; | 437 | QStringList resourceDirs(const char *type) const; |
438 | 438 | ||
439 | /** | 439 | /** |
440 | * This function will return a list of all the types that KStandardDirs | 440 | * This function will return a list of all the types that KStandardDirs |
441 | * supports. | 441 | * supports. |
442 | * | 442 | * |
443 | * @return All types that KDE supports | 443 | * @return All types that KDE supports |
444 | */ | 444 | */ |
445 | QStringList allTypes() const; | 445 | QStringList allTypes() const; |
446 | 446 | ||
447 | /** | 447 | /** |
448 | * Finds a location to save files into for the given type | 448 | * Finds a location to save files into for the given type |
449 | * in the user's home directory. | 449 | * in the user's home directory. |
450 | * | 450 | * |
451 | * @param type The type of location to return. | 451 | * @param type The type of location to return. |
452 | * @param suffix A subdirectory name. | 452 | * @param suffix A subdirectory name. |
453 | * Makes it easier for you to create subdirectories. | 453 | * Makes it easier for you to create subdirectories. |
454 | * You can't pass filenames here, you _have_ to pass | 454 | * You can't pass filenames here, you _have_ to pass |
455 | * directory names only and add possible filename in | 455 | * directory names only and add possible filename in |
456 | * that directory yourself. A directory name always has a | 456 | * that directory yourself. A directory name always has a |
457 | * trailing slash ('/'). | 457 | * trailing slash ('/'). |
458 | * @param create If set, saveLocation() will create the directories | 458 | * @param create If set, saveLocation() will create the directories |
459 | * needed (including those given by @p suffix). | 459 | * needed (including those given by @p suffix). |
460 | * | 460 | * |
461 | * @return A path where resources of the specified type should be | 461 | * @return A path where resources of the specified type should be |
462 | * saved, or QString::null if the resource type is unknown. | 462 | * saved, or QString::null if the resource type is unknown. |
463 | */ | 463 | */ |
464 | QString saveLocation(const char *type, | 464 | QString saveLocation(const char *type, |
465 | const QString& suffix = QString::null, | 465 | const QString& suffix = QString::null, |
466 | bool create = true) const; | 466 | bool create = true) const; |
467 | 467 | ||
468 | /** | 468 | /** |
469 | * Converts an absolute path to a path relative to a certain | 469 | * Converts an absolute path to a path relative to a certain |
470 | * resource. | 470 | * resource. |
471 | * | 471 | * |
472 | * If "abs = ::locate(resource, rel)" | 472 | * If "abs = ::locate(resource, rel)" |
473 | * then "rel = relativeLocation(resource, abs)" and vice versa. | 473 | * then "rel = relativeLocation(resource, abs)" and vice versa. |
474 | * | 474 | * |
475 | * @param type The type of resource. | 475 | * @param type The type of resource. |
476 | * | 476 | * |
477 | * @param absPath An absolute path to make relative. | 477 | * @param absPath An absolute path to make relative. |
478 | * | 478 | * |
479 | * @return A relative path relative to resource @p type that | 479 | * @return A relative path relative to resource @p type that |
480 | * will find @p absPath. If no such relative path exists, absPath | 480 | * will find @p absPath. If no such relative path exists, absPath |
481 | * will be returned unchanged. | 481 | * will be returned unchanged. |
482 | */ | 482 | */ |
483 | QString relativeLocation(const char *type, const QString &absPath); | 483 | QString relativeLocation(const char *type, const QString &absPath); |
484 | 484 | ||
485 | /** | 485 | /** |
486 | * Recursively creates still-missing directories in the given path. | 486 | * Recursively creates still-missing directories in the given path. |
487 | * | 487 | * |
488 | * The resulting permissions will depend on the current umask setting. | 488 | * The resulting permissions will depend on the current umask setting. |
489 | * permission = mode & ~umask. | 489 | * permission = mode & ~umask. |
490 | * | 490 | * |
491 | * @param dir Absolute path of the directory to be made. | 491 | * @param dir Absolute path of the directory to be made. |
492 | * @param mode Directory permissions. | 492 | * @param mode Directory permissions. |
493 | * @return true if successful, false otherwise | 493 | * @return true if successful, false otherwise |
494 | */ | 494 | */ |
495 | static bool makeDir(const QString& dir, int mode = 0755); | 495 | static bool makeDir(const QString& dir, int mode = 0755); |
496 | 496 | ||
497 | /** | 497 | /** |
498 | * This returns a default relative path for the standard KDE | 498 | * This returns a default relative path for the standard KDE |
499 | * resource types. Below is a list of them so you get an idea | 499 | * resource types. Below is a list of them so you get an idea |
500 | * of what this is all about. | 500 | * of what this is all about. |
501 | * | 501 | * |
502 | * @li data - share/apps | 502 | * @li data - share/apps |
503 | * @li html - share/doc/HTML | 503 | * @li html - share/doc/HTML |
504 | * @li icon - share/icon | 504 | * @li icon - share/icon |
505 | * @li config - share/config | 505 | * @li config - share/config |
506 | * @li pixmap - share/pixmaps | 506 | * @li pixmap - share/pixmaps |
507 | * @li apps - share/applnk | 507 | * @li apps - share/applnk |
508 | * @li sound - share/sounds | 508 | * @li sound - share/sounds |
509 | * @li locale - share/locale | 509 | * @li locale - share/locale |
510 | * @li services - share/services | 510 | * @li services - share/services |
511 | * @li servicetypes - share/servicetypes | 511 | * @li servicetypes - share/servicetypes |
512 | * @li mime - share/mimelnk | 512 | * @li mime - share/mimelnk |
513 | * @li wallpaper - share/wallpapers | 513 | * @li wallpaper - share/wallpapers |
514 | * @li templates - share/templates | 514 | * @li templates - share/templates |
515 | * @li exe - bin | 515 | * @li exe - bin |
516 | * @li lib - lib | 516 | * @li lib - lib |
517 | * | 517 | * |
518 | * @returns Static default for the specified resource. You | 518 | * @returns Static default for the specified resource. You |
519 | * should probably be using locate() or locateLocal() | 519 | * should probably be using locate() or locateLocal() |
520 | * instead. | 520 | * instead. |
521 | * @see locate() | 521 | * @see locate() |
522 | * @see locateLocal() | 522 | * @see locateLocal() |
523 | */ | 523 | */ |
524 | static QString kde_default(const char *type); | 524 | static QString kde_default(const char *type); |
525 | 525 | ||
526 | /** | 526 | /** |
527 | * @internal (for use by sycoca only) | 527 | * @internal (for use by sycoca only) |
528 | */ | 528 | */ |
529 | QString kfsstnd_prefixes(); | 529 | QString kfsstnd_prefixes(); |
530 | 530 | ||
531 | /** | 531 | /** |
532 | * Returns the toplevel directory in which KStandardDirs | 532 | * Returns the toplevel directory in which KStandardDirs |
533 | * will store things. Most likely $HOME/.kde | 533 | * will store things. Most likely $HOME/.kde |
534 | * Don't use this function if you can use locateLocal | 534 | * Don't use this function if you can use locateLocal |
535 | * @return the toplevel directory | 535 | * @return the toplevel directory |
536 | */ | 536 | */ |
537 | QString localkdedir() const; | 537 | QString localkdedir() const; |
538 | 538 | ||
539 | /** | 539 | /** |
540 | * @return $XDG_DATA_HOME | 540 | * @return $XDG_DATA_HOME |
541 | * See also http://www.freedesktop.org/standards/basedir/draft/basedir-spec/basedir-spec.html | 541 | * See also http://www.freedesktop.org/standards/basedir/draft/basedir-spec/basedir-spec.html |
542 | */ | 542 | */ |
543 | QString localxdgdatadir() const; | 543 | QString localxdgdatadir() const; |
544 | 544 | ||
545 | /** | 545 | /** |
546 | * @return $XDG_CONFIG_HOME | 546 | * @return $XDG_CONFIG_HOME |
547 | * See also http://www.freedesktop.org/standards/basedir/draft/basedir-spec/basedir-spec.html | 547 | * See also http://www.freedesktop.org/standards/basedir/draft/basedir-spec/basedir-spec.html |
548 | */ | 548 | */ |
549 | QString localxdgconfdir() const; | 549 | QString localxdgconfdir() const; |
550 | 550 | ||
551 | /** | 551 | /** |
552 | * Checks for existence and accessability. | 552 | * Checks for existence and accessability. |
553 | * Faster than creating a QFileInfo first. | 553 | * Faster than creating a QFileInfo first. |
554 | * @param fullPath the path to check | 554 | * @param fullPath the path to check |
555 | * @return true if the directory exists | 555 | * @return true if the directory exists |
556 | */ | 556 | */ |
557 | static bool exists(const QString &fullPath); | 557 | static bool exists(const QString &fullPath); |
558 | 558 | ||
559 | /** | 559 | /** |
560 | * Expands all symbolic links and resolves references to | 560 | * Expands all symbolic links and resolves references to |
561 | * '/./', '/../' and extra '/' characters in @p dirname | 561 | * '/./', '/../' and extra '/' characters in @p dirname |
562 | * and returns the canonicalized absolute pathname. | 562 | * and returns the canonicalized absolute pathname. |
563 | * The resulting path will have no symbolic link, '/./' | 563 | * The resulting path will have no symbolic link, '/./' |
564 | * or '/../' components. | 564 | * or '/../' components. |
565 | * @since 3.1 | 565 | * @since 3.1 |
566 | */ | 566 | */ |
567 | static QString realPath(const QString &dirname); | 567 | static QString realPath(const QString &dirname); |
568 | 568 | ||
569 | static void setAppDir( const QString & ); | 569 | static void setAppDir( const QString & ); |
570 | static QString appDir(); | 570 | static QString appDir(); |
571 | 571 | ||
572 | private: | 572 | private: |
573 | 573 | ||
574 | QStringList prefixes; | 574 | QStringList prefixes; |
575 | 575 | ||
576 | // Directory dictionaries | 576 | // Directory dictionaries |
577 | QDict<QStringList> absolutes; | 577 | QDict<QStringList> absolutes; |
578 | QDict<QStringList> relatives; | 578 | QDict<QStringList> relatives; |
579 | 579 | ||
580 | mutable QDict<QStringList> dircache; | 580 | mutable QDict<QStringList> dircache; |
581 | mutable QDict<QString> savelocations; | 581 | mutable QDict<QString> savelocations; |
582 | 582 | ||
583 | // Disallow assignment and copy-construction | 583 | // Disallow assignment and copy-construction |
584 | KStandardDirs( const KStandardDirs& ); | 584 | KStandardDirs( const KStandardDirs& ); |
585 | KStandardDirs& operator= ( const KStandardDirs& ); | 585 | KStandardDirs& operator= ( const KStandardDirs& ); |
586 | 586 | ||
587 | bool addedCustoms; | 587 | bool addedCustoms; |
588 | 588 | ||
589 | class KStandardDirsPrivate; | 589 | class KStandardDirsPrivate; |
590 | KStandardDirsPrivate *d; | 590 | KStandardDirsPrivate *d; |
591 | //US | 591 | //US |
592 | static QString mAppDir; | 592 | static QString mAppDir; |
593 | 593 | ||
594 | void checkConfig() const; | 594 | void checkConfig() const; |
595 | void applyDataRestrictions(const QString &) const; | 595 | void applyDataRestrictions(const QString &) const; |
596 | //US void createSpecialResource(const char*); | 596 | //US void createSpecialResource(const char*); |
597 | }; | 597 | }; |
598 | 598 | ||
599 | /** | 599 | /** |
600 | * \addtogroup locates Locate Functions | 600 | * \addtogroup locates Locate Functions |
601 | * @{ | 601 | * @{ |
602 | * On The Usage Of 'locate' and 'locateLocal' | 602 | * On The Usage Of 'locate' and 'locateLocal' |
603 | * | 603 | * |
604 | * Typical KDE applications use resource files in one out of | 604 | * Typical KDE applications use resource files in one out of |
605 | * three ways: | 605 | * three ways: |
606 | * | 606 | * |
607 | * 1) A resource file is read but is never written. A system | 607 | * 1) A resource file is read but is never written. A system |
608 | * default is supplied but the user can override this | 608 | * default is supplied but the user can override this |
609 | * default in his local .kde directory: | 609 | * default in his local .kde directory: |
610 | * | 610 | * |
611 | * \code | 611 | * \code |
612 | * // Code example | 612 | * // Code example |
613 | * myFile = locate("appdata", "groups.lst"); | 613 | * myFile = locate("appdata", "groups.lst"); |
614 | * myData = myReadGroups(myFile); // myFile may be null | 614 | * myData = myReadGroups(myFile); // myFile may be null |
615 | * \endcode | 615 | * \endcode |
616 | * | 616 | * |
617 | * 2) A resource file is read and written. If the user has no | 617 | * 2) A resource file is read and written. If the user has no |
618 | * local version of the file the system default is used. | 618 | * local version of the file the system default is used. |
619 | * The resource file is always written to the users local | 619 | * The resource file is always written to the users local |
620 | * .kde directory. | 620 | * .kde directory. |
621 | * | 621 | * |
622 | * \code | 622 | * \code |
623 | * // Code example | 623 | * // Code example |
624 | * myFile = locate("appdata", "groups.lst") | 624 | * myFile = locate("appdata", "groups.lst") |
625 | * myData = myReadGroups(myFile); | 625 | * myData = myReadGroups(myFile); |
626 | * ... | 626 | * ... |
627 | * doSomething(myData); | 627 | * doSomething(myData); |
628 | * ... | 628 | * ... |
629 | * myFile = locateLocal("appdata", "groups.lst"); | 629 | * myFile = locateLocal("appdata", "groups.lst"); |
630 | * myWriteGroups(myFile, myData); | 630 | * myWriteGroups(myFile, myData); |
631 | * \endcode | 631 | * \endcode |
632 | * | 632 | * |
633 | * 3) A resource file is read and written. No system default | 633 | * 3) A resource file is read and written. No system default |
634 | * is used if the user has no local version of the file. | 634 | * is used if the user has no local version of the file. |
635 | * The resource file is always written to the users local | 635 | * The resource file is always written to the users local |
636 | * .kde directory. | 636 | * .kde directory. |
637 | * | 637 | * |
638 | * \code | 638 | * \code |
639 | * // Code example | 639 | * // Code example |
640 | * myFile = locateLocal("appdata", "groups.lst"); | 640 | * myFile = locateLocal("appdata", "groups.lst"); |
641 | * myData = myReadGroups(myFile); | 641 | * myData = myReadGroups(myFile); |
642 | * ... | 642 | * ... |
643 | * doSomething(myData); | 643 | * doSomething(myData); |
644 | * ... | 644 | * ... |
645 | * myFile = locateLocal("appdata", "groups.lst"); | 645 | * myFile = locateLocal("appdata", "groups.lst"); |
646 | * myWriteGroups(myFile, myData); | 646 | * myWriteGroups(myFile, myData); |
647 | * \endcode | 647 | * \endcode |
648 | **/ | 648 | **/ |
649 | 649 | ||
650 | |||
650 | /*! | 651 | /*! |
651 | * \relates KStandardDirs | 652 | * \relates KStandardDirs |
652 | * This function is just for convenience. It simply calls | 653 | * This function is just for convenience. It simply calls |
653 | *instance->dirs()->\link KStandardDirs::findResource() findResource\endlink(type, filename). | 654 | *instance->dirs()->\link KStandardDirs::findResource() findResource\endlink(type, filename). |
654 | **/ | 655 | **/ |
655 | QString locate( const char *type, const QString& filename /*US , const KInstance* instance = KGlobal::instance()*/ ); | 656 | QString locate( const char *type, const QString& filename /*US , const KInstance* instance = KGlobal::instance()*/ ); |
656 | 657 | ||
657 | /*! | 658 | /*! |
658 | * \relates KStandardDirs | 659 | * \relates KStandardDirs |
659 | * This function is much like locate. However it returns a | 660 | * This function is much like locate. However it returns a |
660 | * filename suitable for writing to. No check is made if the | 661 | * filename suitable for writing to. No check is made if the |
661 | * specified filename actually exists. Missing directories | 662 | * specified filename actually exists. Missing directories |
662 | * are created. If filename is only a directory, without a | 663 | * are created. If filename is only a directory, without a |
663 | * specific file, filename must have a trailing slash. | 664 | * specific file, filename must have a trailing slash. |
664 | * | 665 | * |
665 | **/ | 666 | **/ |
666 | QString locateLocal( const char *type, const QString& filename /*US , const KInstance* instance = KGlobal::instance() */ ); | 667 | QString locateLocal( const char *type, const QString& filename /*US , const KInstance* instance = KGlobal::instance() */ ); |
667 | 668 | ||
668 | /*! | 669 | /*! |
669 | * \relates KStandardDirs | 670 | * \relates KStandardDirs |
670 | * This function is much like locate. No check is made if the | 671 | * This function is much like locate. No check is made if the |
671 | * specified filename actually exists. Missing directories | 672 | * specified filename actually exists. Missing directories |
672 | * are created if @p createDir is true. If filename is only | 673 | * are created if @p createDir is true. If filename is only |
673 | * a directory, without a specific file, | 674 | * a directory, without a specific file, |
674 | * filename must have a trailing slash. | 675 | * filename must have a trailing slash. |
675 | * | 676 | * |
676 | **/ | 677 | **/ |
677 | QString locateLocal( const char *type, const QString& filename, bool createDir /*US , const KInstance* instance = KGlobal::instance() */); | 678 | QString locateLocal( const char *type, const QString& filename, bool createDir /*US , const KInstance* instance = KGlobal::instance() */); |
678 | 679 | ||
680 | QString readEnvPath(const char *env); | ||
681 | |||
682 | |||
679 | /*! @} */ | 683 | /*! @} */ |
680 | 684 | ||
681 | #endif // SSK_KSTDDIRS_H | 685 | #endif // SSK_KSTDDIRS_H |