summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opieui/fileselector/ofiledialog.cpp9
1 files changed, 1 insertions, 8 deletions
diff --git a/libopie2/opieui/fileselector/ofiledialog.cpp b/libopie2/opieui/fileselector/ofiledialog.cpp
index e01fbe5..65648ce 100644
--- a/libopie2/opieui/fileselector/ofiledialog.cpp
+++ b/libopie2/opieui/fileselector/ofiledialog.cpp
@@ -1,35 +1,35 @@
1/* 1/*
2               =. This file is part of the OPIE Project 2               =. This file is part of the OPIE Project
3             .=l. Copyright (C) Holger Freyther <zecke@handhelds.org> 3             .=l. Copyright (C) Holger Freyther <freyther@handhelds.org>
4           .>+-= 4           .>+-=
5 _;:,     .>    :=|. This library is free software; you can 5 _;:,     .>    :=|. This library is free software; you can
6.> <`_,   >  .   <= redistribute it and/or modify it under 6.> <`_,   >  .   <= redistribute it and/or modify it under
7:`=1 )Y*s>-.--   : the terms of the GNU Library General Public 7:`=1 )Y*s>-.--   : the terms of the GNU Library General Public
8.="- .-=="i,     .._ License as published by the Free Software 8.="- .-=="i,     .._ License as published by the Free Software
9 - .   .-<_>     .<> Foundation; either version 2 of the License, 9 - .   .-<_>     .<> Foundation; either version 2 of the License,
10     ._= =}       : or (at your option) any later version. 10     ._= =}       : or (at your option) any later version.
11    .%`+i>       _;_. 11    .%`+i>       _;_.
12    .i_,=:_.      -<s. This library is distributed in the hope that 12    .i_,=:_.      -<s. This library is distributed in the hope that
13     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY; 13     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY;
14    : ..    .:,     . . . without even the implied warranty of 14    : ..    .:,     . . . without even the implied warranty of
15    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A 15    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
16  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU 16  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU
17..}^=.=       =       ; Library General Public License for more 17..}^=.=       =       ; Library General Public License for more
18++=   -.     .`     .: details. 18++=   -.     .`     .: details.
19 :     =  ...= . :.=- 19 :     =  ...= . :.=-
20 -.   .:....=;==+<; You should have received a copy of the GNU 20 -.   .:....=;==+<; You should have received a copy of the GNU
21  -_. . .   )=.  = Library General Public License along with 21  -_. . .   )=.  = Library General Public License along with
22    --        :-=` this library; see the file COPYING.LIB. 22    --        :-=` this library; see the file COPYING.LIB.
23 If not, write to the Free Software Foundation, 23 If not, write to the Free Software Foundation,
24 Inc., 59 Temple Place - Suite 330, 24 Inc., 59 Temple Place - Suite 330,
25 Boston, MA 02111-1307, USA. 25 Boston, MA 02111-1307, USA.
26 26
27*/ 27*/
28 28
29 29
30/* OPIE */ 30/* OPIE */
31#include <opie2/ofiledialog.h> 31#include <opie2/ofiledialog.h>
32#include <qpe/applnk.h> 32#include <qpe/applnk.h>
33#include <qpe/config.h> 33#include <qpe/config.h>
34#include <qpe/qpeapplication.h> 34#include <qpe/qpeapplication.h>
35 35
@@ -86,69 +86,64 @@ void saveLastDir( const QString& key, const QString& file )
86 * @param caption The caption of the dialog 86 * @param caption The caption of the dialog
87 * @param wid The parent widget 87 * @param wid The parent widget
88 * @param mode The mode of the OFileSelector @see OFileSelector 88 * @param mode The mode of the OFileSelector @see OFileSelector
89 * @param selector The selector of the OFileSelector 89 * @param selector The selector of the OFileSelector
90 * @param dirName the dir or resource to start from 90 * @param dirName the dir or resource to start from
91 * @param fileName a proposed or existing filename 91 * @param fileName a proposed or existing filename
92 * @param mimetypes The mimeTypes 92 * @param mimetypes The mimeTypes
93 */ 93 */
94OFileDialog::OFileDialog(const QString &caption, 94OFileDialog::OFileDialog(const QString &caption,
95 QWidget *wid, int mode, int selector, 95 QWidget *wid, int mode, int selector,
96 const QString &dirName, 96 const QString &dirName,
97 const QString &fileName, 97 const QString &fileName,
98 const QMap<QString,QStringList>& mimetypes ) 98 const QMap<QString,QStringList>& mimetypes )
99 : QDialog( wid, "OFileDialog", true ) 99 : QDialog( wid, "OFileDialog", true )
100{ 100{
101 // QVBoxLayout *lay = new QVBoxLayout(this); 101 // QVBoxLayout *lay = new QVBoxLayout(this);
102 //showMaximized(); 102 //showMaximized();
103 QVBoxLayout *lay = new QVBoxLayout(this ); 103 QVBoxLayout *lay = new QVBoxLayout(this );
104 file = new OFileSelector(this , mode, selector, 104 file = new OFileSelector(this , mode, selector,
105 dirName, fileName, 105 dirName, fileName,
106 mimetypes ); 106 mimetypes );
107 lay->addWidget( file ); 107 lay->addWidget( file );
108 108
109 //lay->addWidget( file ); 109 //lay->addWidget( file );
110 //showFullScreen(); 110 //showFullScreen();
111 setCaption( caption.isEmpty() ? tr("FileDialog") : caption ); 111 setCaption( caption.isEmpty() ? tr("FileDialog") : caption );
112 connect(file, SIGNAL(fileSelected(const QString&) ), 112 connect(file, SIGNAL(fileSelected(const QString&) ),
113 this, SLOT(slotFileSelected(const QString&) ) ); 113 this, SLOT(slotFileSelected(const QString&) ) );
114 connect(file, SIGNAL(ok() ), 114 connect(file, SIGNAL(ok() ),
115 this, SLOT(slotSelectorOk()) ) ; 115 this, SLOT(slotSelectorOk()) ) ;
116 116
117 connect(file, SIGNAL(dirSelected(const QString&) ), this, SLOT(slotDirSelected(const QString&) ) ); 117 connect(file, SIGNAL(dirSelected(const QString&) ), this, SLOT(slotDirSelected(const QString&) ) );
118
119#if 0
120 connect(file, SIGNAL(dirSelected(const QString&) ),
121 this, SLOT(slotDirSelected(const QString&) ) );
122#endif
123} 118}
124/** 119/**
125 * @returns the mimetype of the selected 120 * @returns the mimetype of the selected
126 * currently it return QString::null 121 * currently it return QString::null
127 */ 122 */
128QString OFileDialog::mimetype()const 123QString OFileDialog::mimetype()const
129{ 124{
130 return QString::null; 125 return QString::null;
131} 126}
132 127
133/** 128/**
134 * @return the fileName 129 * @return the fileName
135 */ 130 */
136QString OFileDialog::fileName()const 131QString OFileDialog::fileName()const
137{ 132{
138 return file->selectedName(); 133 return file->selectedName();
139} 134}
140 135
141/** 136/**
142 * return a DocLnk to the current file 137 * return a DocLnk to the current file
143 */ 138 */
144DocLnk OFileDialog::selectedDocument()const 139DocLnk OFileDialog::selectedDocument()const
145{ 140{
146 return file->selectedDocument(); 141 return file->selectedDocument();
147} 142}
148 143
149/** 144/**
150 * This opens up a filedialog in Open mode 145 * This opens up a filedialog in Open mode
151 * 146 *
152 * @param selector the Selector Mode 147 * @param selector the Selector Mode
153 * @param startDir Where to start from 148 * @param startDir Where to start from
154 * @param file A proposed filename 149 * @param file A proposed filename
@@ -222,35 +217,33 @@ QString OFileDialog::getDirectory(int selector,
222 QWidget *wid, 217 QWidget *wid,
223 const QString &caption ) 218 const QString &caption )
224{ 219{
225 QString ret; 220 QString ret;
226 QString startDir = _startDir; 221 QString startDir = _startDir;
227 if ( startDir.isEmpty() ) 222 if ( startDir.isEmpty() )
228 startDir = lastUsedDir( "FileDialog-SELECTDIR" ); 223 startDir = lastUsedDir( "FileDialog-SELECTDIR" );
229 224
230 OFileDialog dlg( caption.isEmpty() ? tr( "Select Directory" ) : caption, 225 OFileDialog dlg( caption.isEmpty() ? tr( "Select Directory" ) : caption,
231 wid, OFileSelector::DirectorySelector, selector, startDir ); 226 wid, OFileSelector::DirectorySelector, selector, startDir );
232 227
233 if ( QPEApplication::execDialog(&dlg) ) 228 if ( QPEApplication::execDialog(&dlg) )
234 { 229 {
235 ret = dlg.fileName(); 230 ret = dlg.fileName();
236 saveLastDir( "FileDialog-SELECTDIR", ret ); 231 saveLastDir( "FileDialog-SELECTDIR", ret );
237 } 232 }
238 return ret; 233 return ret;
239} 234}
240 235
241void OFileDialog::slotFileSelected(const QString & ) 236void OFileDialog::slotFileSelected(const QString & )
242{ 237{
243 accept(); 238 accept();
244} 239}
245 240
246void OFileDialog::slotSelectorOk( ) 241void OFileDialog::slotSelectorOk( )
247{ 242{
248 accept(); 243 accept();
249} 244}
250 245
251void OFileDialog::slotDirSelected(const QString &dir ) 246void OFileDialog::slotDirSelected(const QString &dir )
252{ 247{
253 setCaption( dir ); 248 setCaption( dir );
254 // if mode
255 //accept();
256} 249}