Diffstat (limited to 'core/apps/textedit/fileBrowser.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | core/apps/textedit/fileBrowser.cpp | 43 |
1 files changed, 27 insertions, 16 deletions
diff --git a/core/apps/textedit/fileBrowser.cpp b/core/apps/textedit/fileBrowser.cpp index 8ea8067..652f830 100644 --- a/core/apps/textedit/fileBrowser.cpp +++ b/core/apps/textedit/fileBrowser.cpp | |||
@@ -11,7 +11,7 @@ | |||
11 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 11 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
12 | ** | 12 | ** |
13 | ****************************************************************************/ | 13 | ****************************************************************************/ |
14 | #define QTOPIA_INTERNAL_MIMEEXT | 14 | //#define QTOPIA_INTERNAL_MIMEEXT |
15 | #include "fileBrowser.h" | 15 | #include "fileBrowser.h" |
16 | //#include "inputDialog.h" | 16 | //#include "inputDialog.h" |
17 | 17 | ||
@@ -50,12 +50,19 @@ fileBrowser::fileBrowser( QWidget* parent, const char* name, bool modal, WFlags | |||
50 | if ( !name ) | 50 | if ( !name ) |
51 | setName( "fileBrowser" ); | 51 | setName( "fileBrowser" ); |
52 | setCaption(tr( name ) ); | 52 | setCaption(tr( name ) ); |
53 | mimeType = mimeFilter; | 53 | // mimeType = mimeFilter; |
54 | MimeType mt( mimeType); | 54 | // MimeType mt( mimeType); |
55 | if( mt.extension().isEmpty()) | 55 | // if( mt.extension().isEmpty()) |
56 | filterStr = "*"; | 56 | QStringList filterList; |
57 | else | 57 | filterList=QStringList::split(";",mimeFilter,FALSE); |
58 | filterStr = "*."+ mt.extension(); | 58 | for ( QStringList::Iterator it = filterList.begin(); it != filterList.end(); ++it ) { |
59 | printf( "%s \n", (*it).latin1() ); | ||
60 | } | ||
61 | |||
62 | filterStr = mimeFilter.right(mimeFilter.length()- mimeFilter.find("/",0,TRUE) - 1);// "*"; | ||
63 | qDebug(filterStr); | ||
64 | // else | ||
65 | // filterStr = "*."+ mt.extension(); | ||
59 | // qDebug("description "+mt.description()); | 66 | // qDebug("description "+mt.description()); |
60 | // qDebug( "id "+mt.id()); | 67 | // qDebug( "id "+mt.id()); |
61 | // qDebug("extension "+mt.extension()); | 68 | // qDebug("extension "+mt.extension()); |
@@ -68,7 +75,7 @@ fileBrowser::fileBrowser( QWidget* parent, const char* name, bool modal, WFlags | |||
68 | layout->setSpacing( 4 ); | 75 | layout->setSpacing( 4 ); |
69 | layout->setMargin( 4 ); | 76 | layout->setMargin( 4 ); |
70 | 77 | ||
71 | dirPathCombo = new QComboBox( FALSE, this, "dorPathCombo" ); | 78 | dirPathCombo = new QComboBox( FALSE, this, "dirPathCombo" ); |
72 | dirPathCombo->setEditable(TRUE); | 79 | dirPathCombo->setEditable(TRUE); |
73 | 80 | ||
74 | connect( dirPathCombo, SIGNAL( activated( const QString & ) ), | 81 | connect( dirPathCombo, SIGNAL( activated( const QString & ) ), |
@@ -130,7 +137,8 @@ fileBrowser::fileBrowser( QWidget* parent, const char* name, bool modal, WFlags | |||
130 | fileSelector = new FileSelector( mimeType, FileStack, "fileselector" , FALSE, FALSE); //buggy | 137 | fileSelector = new FileSelector( mimeType, FileStack, "fileselector" , FALSE, FALSE); //buggy |
131 | // connect( fileSelector, SIGNAL( closeMe() ), this, SLOT( showEditTools() ) ); | 138 | // connect( fileSelector, SIGNAL( closeMe() ), this, SLOT( showEditTools() ) ); |
132 | // connect( fileSelector, SIGNAL( newSelected( const DocLnk &) ), this, SLOT( newFile( const DocLnk & ) ) ); | 139 | // connect( fileSelector, SIGNAL( newSelected( const DocLnk &) ), this, SLOT( newFile( const DocLnk & ) ) ); |
133 | connect( fileSelector, SIGNAL( fileSelected( const DocLnk &) ), this, SLOT( docOpen( const DocLnk & ) ) ); | 140 | connect( fileSelector, SIGNAL( fileSelected( const DocLnk &) ), |
141 | this, SLOT( docOpen( const DocLnk & ) ) ); | ||
134 | layout->addMultiCellWidget( FileStack, 1, 1, 0, 7 ); | 142 | layout->addMultiCellWidget( FileStack, 1, 1, 0, 7 ); |
135 | 143 | ||
136 | SelectionCombo = new QComboBox( FALSE, this, "SelectionCombo" ); | 144 | SelectionCombo = new QComboBox( FALSE, this, "SelectionCombo" ); |
@@ -216,7 +224,7 @@ void fileBrowser::populateList() | |||
216 | pm = Resource::loadPixmap( "locked" ); | 224 | pm = Resource::loadPixmap( "locked" ); |
217 | else { | 225 | else { |
218 | MimeType mt(fi->filePath()); | 226 | MimeType mt(fi->filePath()); |
219 | pm=mt.pixmap(); | 227 | pm=mt.pixmap();// sets the pixmap for the mimetype |
220 | if(pm.isNull()) | 228 | if(pm.isNull()) |
221 | pm = Resource::loadPixmap( "UnknownDocument-14" ); | 229 | pm = Resource::loadPixmap( "UnknownDocument-14" ); |
222 | item->setPixmap( 0,pm); | 230 | item->setPixmap( 0,pm); |
@@ -417,7 +425,7 @@ void fileBrowser::localRename() { | |||
417 | QString curFile = ListView->currentItem()->text(0); | 425 | QString curFile = ListView->currentItem()->text(0); |
418 | InputDialog *fileDlg; | 426 | InputDialog *fileDlg; |
419 | fileDlg = new InputDialog(this,"Rename",TRUE, 0); | 427 | fileDlg = new InputDialog(this,"Rename",TRUE, 0); |
420 | fileDlg->inputText = curFile; | 428 | fileDlg->setTextEdit((const QString &) curFile); |
421 | fileDlg->exec(); | 429 | fileDlg->exec(); |
422 | if( fileDlg->result() == 1 ) { | 430 | if( fileDlg->result() == 1 ) { |
423 | QString oldname = currentDir.canonicalPath() + "/" + curFile; | 431 | QString oldname = currentDir.canonicalPath() + "/" + curFile; |
@@ -492,14 +500,14 @@ void fileBrowser::showType(const QString &t) { | |||
492 | for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) { | 500 | for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) { |
493 | mimeType =(*it); | 501 | mimeType =(*it); |
494 | MimeType mt( mimeType); | 502 | MimeType mt( mimeType); |
495 | qDebug("mime "+mimeType); | 503 | // qDebug("mime "+mimeType); |
496 | // qDebug("description "+mt.description()); | 504 | // qDebug("description "+mt.description()); |
497 | // qDebug( "id "+mt.id()); | 505 | // qDebug( "id "+mt.id()); |
498 | qDebug("extension "+mt.extension()); | 506 | // qDebug("extension "+mt.extension()); |
499 | if( mt.extension().isEmpty()) | 507 | // if( mt.extension().isEmpty()) |
500 | filterStr = "*"; | 508 | filterStr = "*"; |
501 | else | 509 | // else |
502 | filterStr = "*."+ mt.extension()+" "; | 510 | // filterStr = "*."+ mt.extension()+" "; |
503 | // printf( "%s \n", (*it).latin1() ); | 511 | // printf( "%s \n", (*it).latin1() ); |
504 | } | 512 | } |
505 | } | 513 | } |
@@ -611,3 +619,6 @@ InputDialog::~InputDialog() | |||
611 | 619 | ||
612 | } | 620 | } |
613 | 621 | ||
622 | void InputDialog::setTextEdit(const QString &string) { | ||
623 | LineEdit1->setText(string); | ||
624 | } | ||