summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/apps/textedit/fileBrowser.cpp28
-rw-r--r--core/apps/textedit/textedit.cpp99
-rw-r--r--core/apps/textedit/textedit.h7
3 files changed, 73 insertions, 61 deletions
diff --git a/core/apps/textedit/fileBrowser.cpp b/core/apps/textedit/fileBrowser.cpp
index bc99348..f322513 100644
--- a/core/apps/textedit/fileBrowser.cpp
+++ b/core/apps/textedit/fileBrowser.cpp
@@ -48,7 +48,7 @@ fileBrowser::fileBrowser( QWidget* parent, const char* name, bool modal, WFlags
: QDialog( parent, name, modal, fl )
{
if ( !name )
- setName( tr("fileBrowser") );
+ setName( "fileBrowser" );
setCaption(tr( name ) );
// mimeType = mimeFilter;
// MimeType mt( mimeType);
@@ -120,7 +120,7 @@ fileBrowser::fileBrowser( QWidget* parent, const char* name, bool modal, WFlags
ListView->setSorting( 2, FALSE);
ListView->addColumn( tr( "Size" ) );
ListView->setColumnWidth(1,-1);
- ListView->addColumn( tr("Date"),-1);
+ ListView->addColumn( "Date",-1);
ListView->setColumnWidthMode(0,QListView::Manual);
ListView->setColumnAlignment(1,QListView::AlignRight);
@@ -134,7 +134,7 @@ fileBrowser::fileBrowser( QWidget* parent, const char* name, bool modal, WFlags
connect( ListView, SIGNAL( clicked( QListViewItem*)), SLOT(listClicked(QListViewItem *)) );
FileStack->addWidget( ListView, get_unique_id() );
-
+mimeType="text/plain";
fileSelector = new FileSelector( mimeType, FileStack, "fileselector" , FALSE, FALSE); //buggy
// connect( fileSelector, SIGNAL( closeMe() ), this, SLOT( showEditTools() ) );
// connect( fileSelector, SIGNAL( newSelected( const DocLnk &) ), this, SLOT( newFile( const DocLnk & ) ) );
@@ -348,14 +348,14 @@ void fileBrowser::docButtonPushed() {
void fileBrowser::selectionChanged( const QString &select )
{
- if ( select == tr("Documents")) {
+ if ( select == "Documents") {
FileStack->raiseWidget( fileSelector );
dirPathCombo->hide();
cdUpButton->hide();
docButton->hide();
homeButton->hide();
} else {
- if ( select == tr("All files") )
+ if ( select == "All files" )
currentDir.setFilter( QDir::Files | QDir::Dirs | QDir::All);
else
currentDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
@@ -412,7 +412,7 @@ void fileBrowser::doCd() {
void fileBrowser::makDir() {
InputDialog *fileDlg;
- fileDlg = new InputDialog(this,tr("Make Directory"),TRUE, 0);
+ fileDlg = new InputDialog(this,"Make Directory",TRUE, 0);
fileDlg->exec();
if( fileDlg->result() == 1 ) {
QString filename = fileDlg->LineEdit1->text();
@@ -425,14 +425,14 @@ void fileBrowser::makDir() {
void fileBrowser::localRename() {
QString curFile = ListView->currentItem()->text(0);
InputDialog *fileDlg;
- fileDlg = new InputDialog(this,tr("Rename"),TRUE, 0);
+ fileDlg = new InputDialog(this,"Rename",TRUE, 0);
fileDlg->setTextEdit((const QString &) curFile);
fileDlg->exec();
if( fileDlg->result() == 1 ) {
QString oldname = currentDir.canonicalPath() + "/" + curFile;
QString newName = currentDir.canonicalPath() + "/" + fileDlg->LineEdit1->text();//+".playlist";
if( rename(oldname.latin1(), newName.latin1())== -1)
- QMessageBox::message(tr("Note"),tr("Could not rename"));
+ QMessageBox::message("Note","Could not rename");
}
populateList();
}
@@ -440,8 +440,8 @@ void fileBrowser::localRename() {
void fileBrowser::localDelete() {
QString f = ListView->currentItem()->text(0);
if(QDir(f).exists() ) {
- switch ( QMessageBox::warning(this,tr("Delete"),tr("Do you really want to delete\n")+f+
- tr(" ?\nIt must be empty"),tr("Yes"),tr("No"),0,0,1) ) {
+ switch ( QMessageBox::warning(this,"Delete","Do you really want to delete\n"+f+
+ " ?\nIt must be empty","Yes","No",0,0,1) ) {
case 0: {
f=currentDir.canonicalPath()+"/"+f;
QString cmd="rmdir "+f;
@@ -454,8 +454,8 @@ void fileBrowser::localDelete() {
break;
};
} else {
- switch ( QMessageBox::warning(this,tr("Delete"),tr("Do you really want to delete\n")+f
- +" ?",tr("Yes"),tr("No"),0,0,1) ) {
+ switch ( QMessageBox::warning(this,"Delete","Do you really want to delete\n"+f
+ +" ?","Yes","No",0,0,1) ) {
case 0: {
f=currentDir.canonicalPath()+"/"+f;
QString cmd="rm "+f;
@@ -493,7 +493,7 @@ void fileBrowser::updateMimeTypeMenu() {
void fileBrowser::showType(const QString &t) {
qDebug(t);
- if(t.find(tr("All"),0,TRUE) != -1) {
+ if(t.find("All",0,TRUE) != -1) {
filterStr = "*";
} else {
QStringList list = mimetypes.grep( t,TRUE);
@@ -605,7 +605,7 @@ InputDialog::InputDialog( QWidget* parent, const char* name, bool modal, WFlags
: QDialog( parent, name, modal, fl )
{
if ( !name )
- setName( tr("InputDialog") );
+ setName( "InputDialog" );
resize( 234, 50 );
setMaximumSize( QSize( 240, 50 ) );
setCaption( tr(name ) );
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp
index 6804918..943fecd 100644
--- a/core/apps/textedit/textedit.cpp
+++ b/core/apps/textedit/textedit.cpp
@@ -35,6 +35,7 @@
#include <qpe/qpeapplication.h>
#include <qpe/qpemenubar.h>
#include <qpe/qpetoolbar.h>
+#include <qpe/qcopenvelope_qws.h>
//#include <qpe/finddialog.h>
#include <qstringlist.h>
@@ -238,6 +239,10 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
setToolBarsMovable( FALSE );
connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) );
+ channel = new QCopChannel( "QPE/Application/textedit", this );
+ connect( channel, SIGNAL(received(const QCString&, const QByteArray&)),
+ this, SLOT(receive(const QCString&, const QByteArray&)) );
+
setIcon( Resource::loadPixmap( "TextEditor" ) );
QPEToolBar *bar = new QPEToolBar( this );
@@ -397,13 +402,13 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
wa->setOn(wrap);
updateCaption();
- cfg.setGroup("View");
- if(cfg.readEntry("startNew","TRUE") == "TRUE") {
- nStart->setOn(TRUE);
- fileNew();
- } else {
- fileOpen();
- }
+ cfg.setGroup("View");
+ if(cfg.readEntry("startNew","TRUE") == "TRUE") {
+ nStart->setOn(TRUE);
+ fileNew();
+ } else {
+ fileOpen();
+ }
viewSelection = cfg.readNumEntry( "FileView", 0 );
}
@@ -485,17 +490,19 @@ void TextEdit::setWordWrap(bool y)
void TextEdit::fileNew()
{
- if( !bFromDocView ) {
- saveAs();
- }
+// if( !bFromDocView ) {
+// saveAs();
+// }
newFile(DocLnk());
}
void TextEdit::fileOpen()
{
- browseForFiles=new fileBrowser(this,tr("Open File"),TRUE,0, "text/*"); //
+ browseForFiles = new fileBrowser(this,tr("Open File"),TRUE,0, "text/*"); //
browseForFiles->setFileView( viewSelection );
browseForFiles->showMaximized();
+// if( result != -1 )
+
if( browseForFiles->exec() != -1 ) {
QString selFile = browseForFiles->selectedFileName;
QStringList fileList = browseForFiles->fileList;
@@ -618,14 +625,16 @@ void TextEdit::newFile( const DocLnk &f )
setWState (WState_Reserved1 );
editor->setFocus();
doc = new DocLnk(nf);
+ currentFileName = "Unnamed";
qDebug("newFile "+currentFileName);
- updateCaption(currentFileName);
+ updateCaption( currentFileName);
+// editor->setEdited( FALSE);
}
void TextEdit::openFile( const QString &f )
{
- bFromDocView = TRUE;
+// bFromDocView = TRUE;
DocLnk nf;
nf.setType("text/plain");
nf.setFile(f);
@@ -636,39 +645,35 @@ void TextEdit::openFile( const QString &f )
openFile(nf);
showEditTools();
- // Show filename in caption
+ // Show filename in caption
QString name = f;
int sep = name.findRev( '/' );
if ( sep > 0 )
- name = name.mid( sep+1 );
+ name = name.mid( sep+1 );
updateCaption( name );
}
void TextEdit::openFile( const DocLnk &f )
{
// clear();
- bFromDocView = TRUE;
+// bFromDocView = TRUE;
FileManager fm;
QString txt;
currentFileName=f.name();
qDebug("openFile doclnk " + currentFileName);
if ( !fm.loadFile( f, txt ) ) {
- // ####### could be a new file
+ // ####### could be a new file
qDebug( "Cannot open file" );
-
- //return;
}
-
- fileNew();
+// fileNew();
if ( doc )
- delete doc;
+ delete doc;
doc = new DocLnk(f);
editor->setText(txt);
editor->setEdited( FALSE);
edited1=FALSE;
edited=FALSE;
- qDebug("openFile doclnk "+currentFileName);
doc->setName(currentFileName);
updateCaption();
}
@@ -691,9 +696,9 @@ void TextEdit::showEditTools()
bool TextEdit::save()
{
QString file = doc->file();
- qDebug(file);
+ qDebug("saver file "+file);
QString name= doc->name();
- qDebug(name);
+ qDebug("File named "+name);
QString rt = editor->text();
if( !rt.isEmpty() ) {
if(name.isEmpty()) {
@@ -731,13 +736,12 @@ bool TextEdit::save()
bool TextEdit::saveAs()
{
// qDebug("saveAsFile "+currentFileName);
-
- // case of nothing to save... /// there's always something to save
-// if ( !doc )//|| !bFromDocView)
-// {
-// qDebug("no doc");
-// return true;
-// }
+ // case of nothing to save...
+ if ( !doc )//|| !bFromDocView)
+ {
+ qDebug("no doc");
+ return true;
+ }
if ( !editor->edited() ) {
delete doc;
doc = 0;
@@ -747,7 +751,7 @@ bool TextEdit::saveAs()
QString rt = editor->text();
qDebug(currentFileName);
- if( currentFileName.isEmpty() || currentFileName == tr("Unnamed")) {
+ if( currentFileName.isEmpty() || currentFileName == tr("Unnamed") || currentFileName == tr("Text Editor")) {
qDebug("do silly TT filename thing");
if ( doc->name().isEmpty() ) {
QString pt = rt.simplifyWhiteSpace();
@@ -814,7 +818,7 @@ bool TextEdit::saveAs()
if(fileSaveDlg)
delete fileSaveDlg;
return true;
-}
+} //end saveAs
void TextEdit::clear()
{
@@ -835,7 +839,8 @@ void TextEdit::updateCaption( const QString &name )
s = tr( "Unnamed" );
currentFileName=s;
}
-
+ if(s.left(1) == "/")
+ s = s.right(s.length()-1);
setCaption( s + " - " + tr("Text Editor") );
}
}
@@ -843,12 +848,11 @@ void TextEdit::updateCaption( const QString &name )
void TextEdit::setDocument(const QString& fileref)
{
bFromDocView = TRUE;
- qDebug("setDocument "+fileref);
- bFromDocView = TRUE;
if(fileref.find(".desktop",0,TRUE) == -1) {
- openFile(fileref);
+ openFile(fileref);
} else {
- openFile(DocLnk(fileref));
+ qDebug("is desktop file");
+ openFile(DocLnk(fileref));
}
editor->setEdited(TRUE);
edited1=FALSE;
@@ -864,12 +868,9 @@ void TextEdit::closeEvent( QCloseEvent *e )
void TextEdit::accept()
{
- QString file = doc->file();
- if (file.find("_.txt",0,TRUE) ==-1)
- save();
- else {
- QFile(file).remove();
- }
+ //if(caption() !="Unnamed")
+ if(edited1)
+ saveAs();
exit(0);
}
@@ -934,3 +935,11 @@ void TextEdit::editorChanged() {
}
edited=TRUE;
}
+
+void TextEdit::receive(const QCString&msg, const QByteArray&) {
+ qDebug("QCop "+msg);
+ if ( msg == "setDocument(QString)" ) {
+ qDebug("bugger all");
+ }
+
+}
diff --git a/core/apps/textedit/textedit.h b/core/apps/textedit/textedit.h
index af69518..61fa2a0 100644
--- a/core/apps/textedit/textedit.h
+++ b/core/apps/textedit/textedit.h
@@ -28,6 +28,9 @@
#include "fileSaver.h"
#include <qpe/filemanager.h>
+#include <qpe/qcopenvelope_qws.h>
+
+#include <opie/ofileselector.h>
#include <qmainwindow.h>
#include <qmultilineedit.h>
@@ -57,9 +60,10 @@ public:
QAction *nStart;
bool edited, edited1;
void openFile( const QString & );
+ QCopChannel * channel;
public slots:
void editorChanged();
-
+void receive(const QCString&, const QByteArray&);
protected:
void closeEvent( QCloseEvent *e );
void doSearchBar();
@@ -106,7 +110,6 @@ private:
private:
fileSaver *fileSaveDlg;
fileBrowser *browseForFiles;
-
QpeEditor* editor;
QToolBar *menu, *editBar, *searchBar;
QLineEdit *searchEdit;