summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/apps/textedit/fileBrowser.cpp2
-rw-r--r--core/apps/textedit/fileSaver.cpp2
-rw-r--r--core/apps/textedit/textedit.cpp4
3 files changed, 4 insertions, 4 deletions
diff --git a/core/apps/textedit/fileBrowser.cpp b/core/apps/textedit/fileBrowser.cpp
index b029e5b..8c1e962 100644
--- a/core/apps/textedit/fileBrowser.cpp
+++ b/core/apps/textedit/fileBrowser.cpp
@@ -14,33 +14,33 @@
14#include "fileBrowser.h" 14#include "fileBrowser.h"
15#include <qpe/config.h> 15#include <qpe/config.h>
16#include <qpe/resource.h> 16#include <qpe/resource.h>
17 17
18#include <qlistview.h> 18#include <qlistview.h>
19#include <qpushbutton.h> 19#include <qpushbutton.h>
20#include <qfile.h> 20#include <qfile.h>
21#include <qmessagebox.h> 21#include <qmessagebox.h>
22#include <unistd.h> 22#include <unistd.h>
23 23
24fileBrowser::fileBrowser( QWidget* parent, const char* name, bool modal, WFlags fl , const QString filter ) 24fileBrowser::fileBrowser( QWidget* parent, const char* name, bool modal, WFlags fl , const QString filter )
25 : QDialog( parent, name, modal, fl ) 25 : QDialog( parent, name, modal, fl )
26{ 26{
27 if ( !name ) 27 if ( !name )
28 setName( "fileBrowser" ); 28 setName( "fileBrowser" );
29 resize( 240, 280 ); 29 resize( 240, 280 );
30 setCaption(tr( "Browse for file" ) ); 30 setCaption(tr( name ) );
31 filterStr=filter; 31 filterStr=filter;
32 32
33 dirLabel = new QLabel(this, "DirLabel"); 33 dirLabel = new QLabel(this, "DirLabel");
34 dirLabel->setText(currentDir.canonicalPath()); 34 dirLabel->setText(currentDir.canonicalPath());
35 dirLabel->setGeometry(10,20,230,15); 35 dirLabel->setGeometry(10,20,230,15);
36 36
37 QPushButton *homeButton; 37 QPushButton *homeButton;
38 homeButton = new QPushButton(Resource::loadIconSet("home"),"",this,"homeButton"); 38 homeButton = new QPushButton(Resource::loadIconSet("home"),"",this,"homeButton");
39 homeButton->setGeometry(200,4,25,25); 39 homeButton->setGeometry(200,4,25,25);
40 connect(homeButton,SIGNAL(released()),this,SLOT(homeButtonPushed()) ); 40 connect(homeButton,SIGNAL(released()),this,SLOT(homeButtonPushed()) );
41 41
42 ListView = new QListView( this, "ListView" ); 42 ListView = new QListView( this, "ListView" );
43 ListView->addColumn( tr( "Name" ) ); 43 ListView->addColumn( tr( "Name" ) );
44 ListView->setColumnWidth(0,140); 44 ListView->setColumnWidth(0,140);
45 ListView->setSorting( 2, FALSE); 45 ListView->setSorting( 2, FALSE);
46 ListView->addColumn( tr( "Size" ) ); 46 ListView->addColumn( tr( "Size" ) );
diff --git a/core/apps/textedit/fileSaver.cpp b/core/apps/textedit/fileSaver.cpp
index f3be914..d78f2e8 100644
--- a/core/apps/textedit/fileSaver.cpp
+++ b/core/apps/textedit/fileSaver.cpp
@@ -18,33 +18,33 @@
18#include <qpe/qpeapplication.h> 18#include <qpe/qpeapplication.h>
19#include <qlistview.h> 19#include <qlistview.h>
20#include <qpushbutton.h> 20#include <qpushbutton.h>
21#include <qfile.h> 21#include <qfile.h>
22#include <qmessagebox.h> 22#include <qmessagebox.h>
23#include <qlineedit.h> 23#include <qlineedit.h>
24#include <qcheckbox.h> 24#include <qcheckbox.h>
25 25
26#include <unistd.h> 26#include <unistd.h>
27 27
28fileSaver::fileSaver( QWidget* parent, const char* name, bool modal, WFlags fl , const QString currentFileName ) 28fileSaver::fileSaver( QWidget* parent, const char* name, bool modal, WFlags fl , const QString currentFileName )
29 : QDialog( parent, name, modal, fl ) 29 : QDialog( parent, name, modal, fl )
30{ 30{
31 if ( !name ) 31 if ( !name )
32 setName( "fileSaver" ); 32 setName( "fileSaver" );
33 resize( 240, 280 ); 33 resize( 240, 280 );
34 setCaption(tr( "Save file" ) ); 34 setCaption(tr( name ) );
35 QFileInfo fi(currentFileName); 35 QFileInfo fi(currentFileName);
36 QString tmpFileName=fi.fileName(); 36 QString tmpFileName=fi.fileName();
37// qDebug( tmpFileName); 37// qDebug( tmpFileName);
38 dirLabel = new QLabel(this, "DirLabel"); 38 dirLabel = new QLabel(this, "DirLabel");
39 dirLabel->setText(currentDir.canonicalPath()); 39 dirLabel->setText(currentDir.canonicalPath());
40 dirLabel->setGeometry(10,20,230,15); 40 dirLabel->setGeometry(10,20,230,15);
41 41
42 QPushButton *homeButton; 42 QPushButton *homeButton;
43 homeButton = new QPushButton(Resource::loadIconSet("home"),"",this,"homeButton"); 43 homeButton = new QPushButton(Resource::loadIconSet("home"),"",this,"homeButton");
44 homeButton->setGeometry(200,4,25,25); 44 homeButton->setGeometry(200,4,25,25);
45 connect(homeButton,SIGNAL(released()),this,SLOT(homeButtonPushed()) ); 45 connect(homeButton,SIGNAL(released()),this,SLOT(homeButtonPushed()) );
46 46
47 ListView = new QListView( this, "ListView" ); 47 ListView = new QListView( this, "ListView" );
48 ListView->addColumn( tr( "Name" ) ); 48 ListView->addColumn( tr( "Name" ) );
49 ListView->setColumnWidth(0,140); 49 ListView->setColumnWidth(0,140);
50 ListView->setSorting( 2, FALSE); 50 ListView->setSorting( 2, FALSE);
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp
index 72cc4d1..f138572 100644
--- a/core/apps/textedit/textedit.cpp
+++ b/core/apps/textedit/textedit.cpp
@@ -511,33 +511,33 @@ void TextEdit::fileOpen()
511// else { 511// else {
512// delete doc; 512// delete doc;
513// doc = 0; 513// doc = 0;
514// } 514// }
515// } 515// }
516 menu->hide(); 516 menu->hide();
517 editBar->hide(); 517 editBar->hide();
518 searchBar->hide(); 518 searchBar->hide();
519 clearWState (WState_Reserved1 ); 519 clearWState (WState_Reserved1 );
520 editorStack->raiseWidget( fileSelector ); 520 editorStack->raiseWidget( fileSelector );
521 fileSelector->reread(); 521 fileSelector->reread();
522 updateCaption(); 522 updateCaption();
523} 523}
524 524
525void TextEdit::newFileOpen() 525void TextEdit::newFileOpen()
526{ 526{
527 browseForFiles=new fileBrowser(this,"fileBrowser",TRUE,0, "*"); 527 browseForFiles=new fileBrowser(this,"Open File",TRUE,0, "*");
528 if( browseForFiles->exec() != -1 ) { 528 if( browseForFiles->exec() != -1 ) {
529 QString selFile= browseForFiles->selectedFileName; 529 QString selFile= browseForFiles->selectedFileName;
530 QStringList fileList=browseForFiles->fileList; 530 QStringList fileList=browseForFiles->fileList;
531 qDebug(selFile); 531 qDebug(selFile);
532 QStringList::ConstIterator f; 532 QStringList::ConstIterator f;
533 QString fileTemp; 533 QString fileTemp;
534 for ( f = fileList.begin(); f != fileList.end(); f++ ) { 534 for ( f = fileList.begin(); f != fileList.end(); f++ ) {
535 fileTemp = *f; 535 fileTemp = *f;
536 fileTemp.right( fileTemp.length()-5); 536 fileTemp.right( fileTemp.length()-5);
537 QString fileName = fileTemp; 537 QString fileName = fileTemp;
538 if( fileName != "Unnamed" || fileName != "Empty Text" ) { 538 if( fileName != "Unnamed" || fileName != "Empty Text" ) {
539 currentFileName = fileName; 539 currentFileName = fileName;
540 qDebug("please open "+currentFileName); 540 qDebug("please open "+currentFileName);
541 openFile(fileName ); 541 openFile(fileName );
542 } 542 }
543 } 543 }
@@ -750,33 +750,33 @@ bool TextEdit::saveAs()
750 docname = pt.left( i ); 750 docname = pt.left( i );
751 // remove "." at the beginning 751 // remove "." at the beginning
752 while( docname.startsWith( "." ) ) 752 while( docname.startsWith( "." ) )
753 docname = docname.mid( 1 ); 753 docname = docname.mid( 1 );
754 docname.replace( QRegExp("/"), "_" ); 754 docname.replace( QRegExp("/"), "_" );
755 // cut the length. filenames longer than that don't make sense and something goes wrong when they get too long. 755 // cut the length. filenames longer than that don't make sense and something goes wrong when they get too long.
756 if ( docname.length() > 40 ) 756 if ( docname.length() > 40 )
757 docname = docname.left(40); 757 docname = docname.left(40);
758 if ( docname.isEmpty() ) 758 if ( docname.isEmpty() )
759 docname = "Unnamed"; 759 docname = "Unnamed";
760 doc->setName(docname); 760 doc->setName(docname);
761 currentFileName=docname; 761 currentFileName=docname;
762 } 762 }
763 } 763 }
764 764
765 765
766 fileSaveDlg=new fileSaver(this,"SaveFile",TRUE, 0, currentFileName); 766 fileSaveDlg=new fileSaver(this,"Save File",TRUE, 0, currentFileName);
767 qDebug("wanna save filename "+currentFileName); 767 qDebug("wanna save filename "+currentFileName);
768 fileSaveDlg->exec(); 768 fileSaveDlg->exec();
769 if( fileSaveDlg->result() == 1 ) { 769 if( fileSaveDlg->result() == 1 ) {
770 QString fileNm=fileSaveDlg->selectedFileName; 770 QString fileNm=fileSaveDlg->selectedFileName;
771 qDebug("saving filename "+fileNm); 771 qDebug("saving filename "+fileNm);
772 QFileInfo fi(fileNm); 772 QFileInfo fi(fileNm);
773 currentFileName=fi.fileName(); 773 currentFileName=fi.fileName();
774 if(doc) { 774 if(doc) {
775 qDebug("doclnk exists"); 775 qDebug("doclnk exists");
776// QString file = doc->file(); 776// QString file = doc->file();
777// doc->removeFiles(); 777// doc->removeFiles();
778 delete doc; 778 delete doc;
779 DocLnk nf; 779 DocLnk nf;
780 nf.setType("text/plain"); 780 nf.setType("text/plain");
781 nf.setFile( fileNm); 781 nf.setFile( fileNm);
782 doc = new DocLnk(nf); 782 doc = new DocLnk(nf);