author | zautrix <zautrix> | 2005-04-27 23:23:17 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-04-27 23:23:17 (UTC) |
commit | 1540fc9be514330c76c999562fcf3e6bc1e2ffbb (patch) (unidiff) | |
tree | ade066f57be45f0d9783c0efa4e869fee337dd51 /microkde/kfiledialog.cpp | |
parent | 3978688cbe832e2b72c8048b96c9a7c43ce11bc9 (diff) | |
download | kdepimpi-1540fc9be514330c76c999562fcf3e6bc1e2ffbb.zip kdepimpi-1540fc9be514330c76c999562fcf3e6bc1e2ffbb.tar.gz kdepimpi-1540fc9be514330c76c999562fcf3e6bc1e2ffbb.tar.bz2 |
csv fixes
-rw-r--r-- | microkde/kfiledialog.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/microkde/kfiledialog.cpp b/microkde/kfiledialog.cpp index 3f47425..6be1580 100644 --- a/microkde/kfiledialog.cpp +++ b/microkde/kfiledialog.cpp | |||
@@ -1,76 +1,79 @@ | |||
1 | #include <kfiledialog.h> | 1 | #include <kfiledialog.h> |
2 | #include <qdialog.h> | 2 | #include <qdialog.h> |
3 | #include <qlayout.h> | 3 | #include <qlayout.h> |
4 | #include <qdir.h> | 4 | #include <qdir.h> |
5 | #include <qfileinfo.h> | 5 | #include <qfileinfo.h> |
6 | #include <qapplication.h> | 6 | #include <qapplication.h> |
7 | 7 | ||
8 | #ifndef DESKTOP_VERSION | 8 | #ifndef DESKTOP_VERSION |
9 | //US orig#include <ofileselector.h> | 9 | //US orig#include <ofileselector.h> |
10 | #include <ofileselector_p.h> | 10 | #include <ofileselector_p.h> |
11 | QString KFileDialog::getSaveFileName( const QString & fn, | 11 | QString KFileDialog::getSaveFileName( const QString & fn, |
12 | const QString & cap , QWidget * par ) | 12 | const QString & cap , QWidget * par ) |
13 | { | 13 | { |
14 | QString retfile = ""; | 14 | QString retfile = ""; |
15 | QDialog dia ( par, "input-dialog", true ); | 15 | QDialog dia ( par, "input-dialog", true ); |
16 | QVBoxLayout lay( &dia ); | 16 | QVBoxLayout lay( &dia ); |
17 | lay.setMargin(7); | 17 | lay.setMargin(7); |
18 | lay.setSpacing(7); | 18 | lay.setSpacing(7); |
19 | QString file = fn; | 19 | QString file = fn; |
20 | if ( file.isEmpty() ) | 20 | if ( file.isEmpty() ) |
21 | file = QDir::homeDirPath()+"/*"; | 21 | file = QDir::homeDirPath()+"/*"; |
22 | QFileInfo fi ( file ); | 22 | QFileInfo fi ( file ); |
23 | OFileSelector o ( &dia,OFileSelector::FileSelector, OFileSelector::Save, fi.dirPath(true), fi.fileName() ); | 23 | OFileSelector o ( &dia,OFileSelector::FileSelector, OFileSelector::Save, fi.dirPath(true), fi.fileName() ); |
24 | QObject::connect ( &o, SIGNAL( ok() ), &dia, SLOT ( accept () ) ); | 24 | QObject::connect ( &o, SIGNAL( ok() ), &dia, SLOT ( accept () ) ); |
25 | lay.addWidget( &o); | 25 | lay.addWidget( &o); |
26 | // o.setNewVisible( true ); | 26 | // o.setNewVisible( true ); |
27 | // o.setNameVisible( true ); | 27 | // o.setNameVisible( true ); |
28 | dia.showMaximized(); | 28 | dia.showMaximized(); |
29 | dia.setCaption( cap ); | 29 | if ( cap.isEmpty() ) |
30 | dia.setCaption( file ); | ||
31 | else | ||
32 | dia.setCaption( cap ); | ||
30 | int res = dia.exec(); | 33 | int res = dia.exec(); |
31 | if ( res ) | 34 | if ( res ) |
32 | retfile = o.selectedName(); | 35 | retfile = o.selectedName(); |
33 | return retfile; | 36 | return retfile; |
34 | } | 37 | } |
35 | 38 | ||
36 | QString KFileDialog::getOpenFileName( const QString & fn, | 39 | QString KFileDialog::getOpenFileName( const QString & fn, |
37 | const QString & cap, QWidget * par ) | 40 | const QString & cap, QWidget * par ) |
38 | { | 41 | { |
39 | QString retfile = ""; | 42 | QString retfile = ""; |
40 | QDialog dia ( par, "input-dialog", true ); | 43 | QDialog dia ( par, "input-dialog", true ); |
41 | // QLineEdit lab ( &dia ); | 44 | // QLineEdit lab ( &dia ); |
42 | QVBoxLayout lay( &dia ); | 45 | QVBoxLayout lay( &dia ); |
43 | lay.setMargin(7); | 46 | lay.setMargin(7); |
44 | lay.setSpacing(7); | 47 | lay.setSpacing(7); |
45 | QString file = fn; | 48 | QString file = fn; |
46 | if ( file.isEmpty() ) | 49 | if ( file.isEmpty() ) |
47 | file = QDir::homeDirPath()+"/*";; | 50 | file = QDir::homeDirPath()+"/*";; |
48 | QFileInfo fi ( file ); | 51 | QFileInfo fi ( file ); |
49 | OFileSelector o ( &dia,OFileSelector::FileSelector, OFileSelector::Open, fi.dirPath(true), fi.fileName() ); | 52 | OFileSelector o ( &dia,OFileSelector::FileSelector, OFileSelector::Open, fi.dirPath(true), fi.fileName() ); |
50 | QObject::connect ( &o, SIGNAL( ok() ), &dia, SLOT ( accept () ) ); | 53 | QObject::connect ( &o, SIGNAL( ok() ), &dia, SLOT ( accept () ) ); |
51 | lay.addWidget( &o); | 54 | lay.addWidget( &o); |
52 | dia.showMaximized(); | 55 | dia.showMaximized(); |
53 | dia.setCaption( cap ); | 56 | dia.setCaption( cap ); |
54 | int res = dia.exec(); | 57 | int res = dia.exec(); |
55 | if ( res ) | 58 | if ( res ) |
56 | retfile = o.selectedName(); | 59 | retfile = o.selectedName(); |
57 | return retfile; | 60 | return retfile; |
58 | } | 61 | } |
59 | 62 | ||
60 | #else | 63 | #else |
61 | 64 | ||
62 | #include <qfiledialog.h> | 65 | #include <qfiledialog.h> |
63 | 66 | ||
64 | QString KFileDialog::getSaveFileName( const QString & fn, | 67 | QString KFileDialog::getSaveFileName( const QString & fn, |
65 | const QString & cap , QWidget * par ) | 68 | const QString & cap , QWidget * par ) |
66 | { | 69 | { |
67 | return QFileDialog::getSaveFileName( fn, QString::null, par, "openfile", cap ); | 70 | return QFileDialog::getSaveFileName( fn, QString::null, par, "openfile", cap ); |
68 | } | 71 | } |
69 | QString KFileDialog::getOpenFileName( const QString & fn, | 72 | QString KFileDialog::getOpenFileName( const QString & fn, |
70 | const QString & cap, QWidget * par ) | 73 | const QString & cap, QWidget * par ) |
71 | { | 74 | { |
72 | 75 | ||
73 | return QFileDialog::getOpenFileName( fn, QString::null, par, "openfile", cap ); | 76 | return QFileDialog::getOpenFileName( fn, QString::null, par, "openfile", cap ); |
74 | } | 77 | } |
75 | #endif | 78 | #endif |
76 | 79 | ||