-rw-r--r-- | microkde/kio/kfile/kurlrequester.cpp | 10 | ||||
-rw-r--r-- | microkde/kio/kfile/kurlrequester.h | 4 |
2 files changed, 8 insertions, 6 deletions
diff --git a/microkde/kio/kfile/kurlrequester.cpp b/microkde/kio/kfile/kurlrequester.cpp index ca94570..ce62da7 100644 --- a/microkde/kio/kfile/kurlrequester.cpp +++ b/microkde/kio/kfile/kurlrequester.cpp | |||
@@ -14,32 +14,34 @@ | |||
14 | along with this library; see the file COPYING.LIB. If not, write to | 14 | along with this library; see the file COPYING.LIB. If not, write to |
15 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 15 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
16 | Boston, MA 02111-1307, USA. | 16 | Boston, MA 02111-1307, USA. |
17 | */ | 17 | */ |
18 | 18 | ||
19 | 19 | ||
20 | #include <sys/stat.h> | 20 | #include <sys/stat.h> |
21 | #ifdef _WIN32_ | 21 | #ifdef _WIN32_ |
22 | 22 | ||
23 | #else | 23 | #else |
24 | #include <unistd.h> | 24 | #include <unistd.h> |
25 | #endif | 25 | #endif |
26 | #include <qstring.h> | 26 | #include <qstring.h> |
27 | //US #include <qtooltip.h> | 27 | //US #include <qtooltip.h> |
28 | 28 | ||
29 | #include <qpushbutton.h> | 29 | #include <qpushbutton.h> |
30 | //Added by qt3to4: | ||
31 | #include <QPixmap> | ||
30 | 32 | ||
31 | //US #include <kaccel.h> | 33 | //US #include <kaccel.h> |
32 | //US #include <kcombobox.h> | 34 | //US #include <kcombobox.h> |
33 | #include <kdebug.h> | 35 | #include <kdebug.h> |
34 | #include <kdialog.h> | 36 | #include <kdialog.h> |
35 | #include <kfiledialog.h> | 37 | #include <kfiledialog.h> |
36 | #include <kglobal.h> | 38 | #include <kglobal.h> |
37 | #include <kiconloader.h> | 39 | #include <kiconloader.h> |
38 | #include <klineedit.h> | 40 | #include <klineedit.h> |
39 | #include <klocale.h> | 41 | #include <klocale.h> |
40 | //US #include <kurlcompletion.h> | 42 | //US #include <kurlcompletion.h> |
41 | //US #include <kurldrag.h> | 43 | //US #include <kurldrag.h> |
42 | //US #include <kprotocolinfo.h> | 44 | //US #include <kprotocolinfo.h> |
43 | 45 | ||
44 | 46 | ||
45 | #include "kurlrequester.h" | 47 | #include "kurlrequester.h" |
@@ -169,68 +171,68 @@ KURLRequester::KURLRequester( QWidget *editWidget, QWidget *parent, | |||
169 | const char *name ) | 171 | const char *name ) |
170 | : QHBox( parent, name ) | 172 | : QHBox( parent, name ) |
171 | { | 173 | { |
172 | d = new KURLRequesterPrivate; | 174 | d = new KURLRequesterPrivate; |
173 | 175 | ||
174 | // must have this as parent | 176 | // must have this as parent |
175 | editWidget->reparent( this, 0, QPoint(0,0) ); | 177 | editWidget->reparent( this, 0, QPoint(0,0) ); |
176 | //US d->edit = dynamic_cast<KLineEdit*>( editWidget ); | 178 | //US d->edit = dynamic_cast<KLineEdit*>( editWidget ); |
177 | d->edit = (KLineEdit*)( editWidget ); | 179 | d->edit = (KLineEdit*)( editWidget ); |
178 | //US d->combo = dynamic_cast<KComboBox*>( editWidget ); | 180 | //US d->combo = dynamic_cast<KComboBox*>( editWidget ); |
179 | 181 | ||
180 | init(); | 182 | init(); |
181 | } | 183 | } |
182 | */ | 184 | */ |
183 | 185 | ||
184 | KURLRequester::KURLRequester( QWidget *parent, const char *name ) | 186 | KURLRequester::KURLRequester( QWidget *parent, const char *name ) |
185 | : QHBox( parent, name ) | 187 | : Q3HBox( parent, name ) |
186 | { | 188 | { |
187 | d = new KURLRequesterPrivate; | 189 | d = new KURLRequesterPrivate; |
188 | init(); | 190 | init(); |
189 | } | 191 | } |
190 | 192 | ||
191 | 193 | ||
192 | KURLRequester::KURLRequester( const QString& url, QWidget *parent, | 194 | KURLRequester::KURLRequester( const QString& url, QWidget *parent, |
193 | const char *name ) | 195 | const char *name ) |
194 | : QHBox( parent, name ) | 196 | : Q3HBox( parent, name ) |
195 | { | 197 | { |
196 | d = new KURLRequesterPrivate; | 198 | d = new KURLRequesterPrivate; |
197 | init(); | 199 | init(); |
198 | setURL( url ); | 200 | setURL( url ); |
199 | } | 201 | } |
200 | 202 | ||
201 | 203 | ||
202 | KURLRequester::~KURLRequester() | 204 | KURLRequester::~KURLRequester() |
203 | { | 205 | { |
204 | //US delete myCompletion; | 206 | //US delete myCompletion; |
205 | delete myFileDialog; | 207 | delete myFileDialog; |
206 | delete d; | 208 | delete d; |
207 | } | 209 | } |
208 | 210 | ||
209 | 211 | ||
210 | void KURLRequester::init() | 212 | void KURLRequester::init() |
211 | { | 213 | { |
212 | myFileDialog = 0L; | 214 | myFileDialog = 0L; |
213 | myShowLocalProt = false; | 215 | myShowLocalProt = false; |
214 | mPathIsDir = false; | 216 | mPathIsDir = false; |
215 | if (/*US !d->combo && */ !d->edit ) | 217 | if (/*US !d->combo && */ !d->edit ) |
216 | d->edit = new KLineEdit( this, "KURLRequester::KLineEdit" ); | 218 | d->edit = new KLineEdit( this, "KURLRequester::KLineEdit" ); |
217 | 219 | ||
218 | myButton = new KURLDragPushButton( this, "kfile button"); | 220 | myButton = new KURLDragPushButton( this, "kfile button"); |
219 | QIconSet iconSet = SmallIconSet("fileopen"); | 221 | QIcon iconSet = SmallIconSet("fileopen"); |
220 | QPixmap pixMap = iconSet.pixmap( QIconSet::Small, QIconSet::Normal ); | 222 | QPixmap pixMap = iconSet.pixmap( QIcon::Small, QIcon::Normal ); |
221 | myButton->setIconSet( iconSet ); | 223 | myButton->setIconSet( iconSet ); |
222 | myButton->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); | 224 | myButton->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); |
223 | //US QToolTip::add(myButton, i18n("Open file dialog")); | 225 | //US QToolTip::add(myButton, i18n("Open file dialog")); |
224 | 226 | ||
225 | connect( myButton, SIGNAL( pressed() ), SLOT( slotUpdateURL() )); | 227 | connect( myButton, SIGNAL( pressed() ), SLOT( slotUpdateURL() )); |
226 | 228 | ||
227 | setSpacing( KDialog::spacingHint() ); | 229 | setSpacing( KDialog::spacingHint() ); |
228 | 230 | ||
229 | QWidget *widget = /*US d->combo ? (QWidget*) d->combo : */ (QWidget*) d->edit; | 231 | QWidget *widget = /*US d->combo ? (QWidget*) d->combo : */ (QWidget*) d->edit; |
230 | setFocusProxy( widget ); | 232 | setFocusProxy( widget ); |
231 | 233 | ||
232 | d->connectSignals( this ); | 234 | d->connectSignals( this ); |
233 | connect( myButton, SIGNAL( clicked() ), this, SLOT( slotOpenDialog() )); | 235 | connect( myButton, SIGNAL( clicked() ), this, SLOT( slotOpenDialog() )); |
234 | /*US | 236 | /*US |
235 | myCompletion = new KURLCompletion(); | 237 | myCompletion = new KURLCompletion(); |
236 | d->setCompletionObject( myCompletion ); | 238 | d->setCompletionObject( myCompletion ); |
diff --git a/microkde/kio/kfile/kurlrequester.h b/microkde/kio/kfile/kurlrequester.h index faa3326..5d4fa11 100644 --- a/microkde/kio/kfile/kurlrequester.h +++ b/microkde/kio/kfile/kurlrequester.h | |||
@@ -7,66 +7,66 @@ | |||
7 | 7 | ||
8 | This library is distributed in the hope that it will be useful, | 8 | This library is distributed in the hope that it will be useful, |
9 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 9 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
10 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 10 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
11 | Library General Public License for more details. | 11 | Library General Public License for more details. |
12 | 12 | ||
13 | You should have received a copy of the GNU Library General Public License | 13 | You should have received a copy of the GNU Library General Public License |
14 | along with this library; see the file COPYING.LIB. If not, write to | 14 | along with this library; see the file COPYING.LIB. If not, write to |
15 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 15 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
16 | Boston, MA 02111-1307, USA. | 16 | Boston, MA 02111-1307, USA. |
17 | */ | 17 | */ |
18 | 18 | ||
19 | 19 | ||
20 | #ifndef KURLREQUESTER_H | 20 | #ifndef KURLREQUESTER_H |
21 | #define KURLREQUESTER_H | 21 | #define KURLREQUESTER_H |
22 | 22 | ||
23 | #include <qhbox.h> | 23 | #include <q3hbox.h> |
24 | 24 | ||
25 | #include <keditlistbox.h> | 25 | #include <keditlistbox.h> |
26 | //US #include <kfile.h> | 26 | //US #include <kfile.h> |
27 | //US #include <kpushbutton.h> | 27 | //US #include <kpushbutton.h> |
28 | #include <kurl.h> | 28 | #include <kurl.h> |
29 | 29 | ||
30 | //US class KComboBox; | 30 | //US class KComboBox; |
31 | 31 | ||
32 | class KFileDialog; | 32 | class KFileDialog; |
33 | class KLineEdit; | 33 | class KLineEdit; |
34 | //US class KURLCompletion; | 34 | //US class KURLCompletion; |
35 | class KURLDragPushButton; | 35 | class KURLDragPushButton; |
36 | 36 | ||
37 | class QPushButton; | 37 | class QPushButton; |
38 | class QString; | 38 | class QString; |
39 | class QTimer; | 39 | class QTimer; |
40 | 40 | ||
41 | /** | 41 | /** |
42 | * This class is a widget showing a lineedit and a button, which invokes a | 42 | * This class is a widget showing a lineedit and a button, which invokes a |
43 | * filedialog. File name completion is available in the lineedit. | 43 | * filedialog. File name completion is available in the lineedit. |
44 | * | 44 | * |
45 | * The defaults for the filedialog are to ask for one existing local file, i.e. | 45 | * The defaults for the filedialog are to ask for one existing local file, i.e. |
46 | * KFileDialog::setMode( KFile::File | KFile::ExistingOnly | KFile::LocalOnly ) | 46 | * KFileDialog::setMode( KFile::File | KFile::ExistingOnly | KFile::LocalOnly ) |
47 | * The default filter is "*", i.e. show all files, and the start directory is | 47 | * The default filter is "*", i.e. show all files, and the start directory is |
48 | * the current working directory, or the last directory where a file has been | 48 | * the current working directory, or the last directory where a file has been |
49 | * selected. | 49 | * selected. |
50 | * | 50 | * |
51 | * You can change this behavior by using @ref setMode() or @ref setFilter(). | 51 | * You can change this behavior by using @ref setMode() or @ref setFilter(). |
52 | * | 52 | * |
53 | * @short A widget to request a filename/url from the user | 53 | * @short A widget to request a filename/url from the user |
54 | * @author Carsten Pfeiffer <pfeiffer@kde.org> | 54 | * @author Carsten Pfeiffer <pfeiffer@kde.org> |
55 | */ | 55 | */ |
56 | class KURLRequester : public QHBox | 56 | class KURLRequester : public Q3HBox |
57 | { | 57 | { |
58 | Q_OBJECT | 58 | Q_OBJECT |
59 | Q_PROPERTY( QString url READ url WRITE setURL ) | 59 | Q_PROPERTY( QString url READ url WRITE setURL ) |
60 | 60 | ||
61 | public: | 61 | public: |
62 | /** | 62 | /** |
63 | * Constructs a KURLRequester widget. | 63 | * Constructs a KURLRequester widget. |
64 | */ | 64 | */ |
65 | KURLRequester( QWidget *parent=0, const char *name=0 ); | 65 | KURLRequester( QWidget *parent=0, const char *name=0 ); |
66 | 66 | ||
67 | /** | 67 | /** |
68 | * Constructs a KURLRequester widget with the initial URL @p url. | 68 | * Constructs a KURLRequester widget with the initial URL @p url. |
69 | */ | 69 | */ |
70 | KURLRequester( const QString& url, QWidget *parent=0, const char *name=0 ); | 70 | KURLRequester( const QString& url, QWidget *parent=0, const char *name=0 ); |
71 | 71 | ||
72 | /** | 72 | /** |