committed by ljp (llornkcor) small change to captions.

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
@@ -1,126 +1,126 @@
 /****************************************************************************
 ** copyright 2001 ljp ljp@llornkcor.com
 ** Created: Fri Dec 14 08:16:46 2001
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ****************************************************************************/
 #include "fileBrowser.h"
 #include <qpe/config.h>
 #include <qpe/resource.h>
 
 #include <qlistview.h>
 #include <qpushbutton.h>
 #include <qfile.h>
 #include <qmessagebox.h>
 #include <unistd.h>
 
 fileBrowser::fileBrowser( QWidget* parent,  const char* name, bool modal, WFlags fl , const QString filter )
     : QDialog( parent, name, modal, fl )
 {
     if ( !name )
   setName( "fileBrowser" );
     resize( 240, 280 );
-    setCaption(tr( "Browse for file" ) );
+    setCaption(tr( name ) );
     filterStr=filter;
 
     dirLabel = new QLabel(this, "DirLabel");
     dirLabel->setText(currentDir.canonicalPath());
     dirLabel->setGeometry(10,20,230,15);
 
     QPushButton *homeButton;
     homeButton = new QPushButton(Resource::loadIconSet("home"),"",this,"homeButton");
     homeButton->setGeometry(200,4,25,25);
     connect(homeButton,SIGNAL(released()),this,SLOT(homeButtonPushed()) );
 
     ListView = new QListView( this, "ListView" );
     ListView->addColumn( tr( "Name" ) );
     ListView->setColumnWidth(0,140);
     ListView->setSorting( 2, FALSE);
     ListView->addColumn( tr( "Size" ) );
     ListView->setColumnWidth(1,59);
 //      ListView->addColumn( tr( "" ) );
     ListView->setColumnWidthMode(0,QListView::Manual);
     ListView->setColumnAlignment(1,QListView::AlignRight);
 //      ListView->setMultiSelection(true);
 //      ListView->setSelectionMode(QListView::Extended);
 
     ListView->setAllColumnsShowFocus( TRUE );
     ListView->setGeometry( QRect( 10, 35, 220, 240 ) );
 
     // signals and slots connections
     connect( ListView, SIGNAL(doubleClicked( QListViewItem*)), SLOT(listDoubleClicked(QListViewItem *)) );
     connect( ListView, SIGNAL(pressed( QListViewItem*)), SLOT(listClicked(QListViewItem *)) );
     currentDir.setPath(QDir::currentDirPath());
     populateList();
     move(0,15); 
 }
 
 fileBrowser::~fileBrowser()
 {
 }
 
 
 void fileBrowser::populateList()
 {
     ListView->clear();
 //qDebug(currentDir.canonicalPath());
     currentDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
     currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
     currentDir.setMatchAllDirs(TRUE);
 
     currentDir.setNameFilter(filterStr);
 //    currentDir.setNameFilter("*.txt;*.etx");
     QString fileL, fileS;
     const QFileInfoList *list = currentDir.entryInfoList( /*QDir::All*/ /*, QDir::SortByMask*/);
     QFileInfoListIterator it(*list);
     QFileInfo *fi;
     while ( (fi=it.current()) ) {
 
         if (fi->isSymLink() ){
             QString symLink=fi->readLink();
 //         qDebug("Symlink detected "+symLink);
          QFileInfo sym( symLink);
             fileS.sprintf( "%10li", sym.size() );
             fileL.sprintf( "%s ->  %s",  sym.fileName().data(),sym.absFilePath().data() );
 
         } else {
 //        qDebug("Not a dir: "+currentDir.canonicalPath()+fileL);
             fileS.sprintf( "%10li", fi->size() );
             fileL.sprintf( "%s",fi->fileName().data() );
             if( QDir(QDir::cleanDirPath(currentDir.canonicalPath()+"/"+fileL)).exists() ) {
                 fileL+="/";
 //     qDebug( fileL);
             }
         }
         item= new QListViewItem( ListView,fileL,fileS );
         ++it;
     }
     ListView->setSorting( 2, FALSE);
     dirLabel->setText(currentDir.canonicalPath());
 }
 
 void fileBrowser::upDir()
 {
 //    qDebug(currentDir.canonicalPath());
 }
 
 void fileBrowser::listDoubleClicked(QListViewItem *selectedItem)
 {
 }
 
 // you may want to switch these 2 functions. I like single clicks
 void fileBrowser::listClicked(QListViewItem *selectedItem)
 {
     QString strItem=selectedItem->text(0);
     QString strSize=selectedItem->text(1);
 //    qDebug("strItem is "+strItem);
     strSize.stripWhiteSpace();
 //  qDebug(strSize);
 
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
@@ -1,130 +1,130 @@
 /****************************************************************************
 ** copyright 2001 ljp ljp@llornkcor.com
 ** Created: Fri Dec 14 08:16:46 2001 fileSaver.cpp
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ****************************************************************************/
 #include "fileSaver.h"
 #include <qpe/config.h>
 #include <qpe/resource.h>
 
 #include <qpe/qpeapplication.h>
 #include <qlistview.h>
 #include <qpushbutton.h>
 #include <qfile.h>
 #include <qmessagebox.h>
 #include <qlineedit.h>
 #include <qcheckbox.h>
 
 #include <unistd.h>
 
 fileSaver::fileSaver( QWidget* parent,  const char* name, bool modal, WFlags fl , const QString currentFileName )
     : QDialog( parent, name, modal, fl )
 {
     if ( !name )
   setName( "fileSaver" );
     resize( 240, 280 );
-    setCaption(tr( "Save file" ) );
+    setCaption(tr( name ) );
     QFileInfo fi(currentFileName);
     QString tmpFileName=fi.fileName();
 //    qDebug( tmpFileName);
     dirLabel = new QLabel(this, "DirLabel");
     dirLabel->setText(currentDir.canonicalPath());
     dirLabel->setGeometry(10,20,230,15);
 
     QPushButton *homeButton;
     homeButton = new QPushButton(Resource::loadIconSet("home"),"",this,"homeButton");
     homeButton->setGeometry(200,4,25,25);
     connect(homeButton,SIGNAL(released()),this,SLOT(homeButtonPushed()) );
     
     ListView = new QListView( this, "ListView" );
     ListView->addColumn( tr( "Name" ) );
     ListView->setColumnWidth(0,140);
     ListView->setSorting( 2, FALSE);
     ListView->addColumn( tr( "Size" ) );
     ListView->setColumnWidth(1,59);
     ListView->setColumnWidthMode(0,QListView::Manual);
     ListView->setColumnAlignment(1,QListView::AlignRight);
 //      ListView->setMultiSelection(true);
 //      ListView->setSelectionMode(QListView::Extended);
 
     ListView->setAllColumnsShowFocus( TRUE );
     ListView->setGeometry( QRect( 10,35,220,125));
 
     fileEdit= new QLineEdit(this);
     fileEdit->setGeometry( QRect( 10, 162, 205, 17));
 
     fileEdit->setText( tmpFileName);
 
     filePermCheck = new QCheckBox( this, "SetFilePerms" );
     filePermCheck->setText("set file permissions");
     filePermCheck->setGeometry(10, 178, 150,17);
       // signals and slots connections
     connect( ListView, SIGNAL(doubleClicked( QListViewItem*)), SLOT(listDoubleClicked(QListViewItem *)) );
     connect( ListView, SIGNAL(pressed( QListViewItem*)), SLOT(listClicked(QListViewItem *)) );
 
 //      tmpFileName=fi.FilePath();
 //      qDebug( tmpFileName);
     currentDir.setPath( QDir::currentDirPath() );
     populateList();
     move(0,15);
 
 }
 
 fileSaver::~fileSaver()
 {
 }
 
 void fileSaver::populateList()
 {
     ListView->clear();
     currentDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden );
     currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
     currentDir.setMatchAllDirs(TRUE);
 
     currentDir.setNameFilter("*");
     QString fileL, fileS;
     const QFileInfoList *list = currentDir.entryInfoList( /*QDir::All*/ /*, QDir::SortByMask*/);
     QFileInfoListIterator it(*list);
     QFileInfo *fi;
     while ( (fi=it.current()) ) {
 
         if (fi->isSymLink() ){
             QString symLink=fi->readLink();
 //         qDebug("Symlink detected "+symLink);
          QFileInfo sym( symLink);
             fileS.sprintf( "%10li", sym.size() );
             fileL.sprintf( "%s ->  %s",  sym.fileName().data(),sym.absFilePath().data() );
 
         } else {
 //  //        qDebug("Not a dir: "+currentDir.canonicalPath()+fileL);
             fileS.sprintf( "%10li", fi->size() );
             fileL.sprintf( "%s",fi->fileName().data() );
             if( QDir(QDir::cleanDirPath(currentDir.canonicalPath()+"/"+fileL)).exists() ) {
                 fileL+="/";
 //     qDebug(currentDir.canonicalPath()+fileL);
             }
         }
         item= new QListViewItem( ListView,fileL,fileS );
         ++it;
     }
     ListView->setSorting( 2, FALSE);
     dirLabel->setText(currentDir.canonicalPath());
 
 
 }
 
 void fileSaver::upDir()
 {
 //    qDebug(currentDir.canonicalPath());
 }
 
 void fileSaver::listDoubleClicked(QListViewItem *selectedItem)
 {
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
@@ -431,193 +431,193 @@ TextEdit::~TextEdit()
 }
 
 void TextEdit::zoomIn()
 {
     setFontSize(editor->font().pointSize()+1,FALSE);
 }
 
 void TextEdit::zoomOut()
 {
     setFontSize(editor->font().pointSize()-1,TRUE);
 }
 
 
 void TextEdit::setFontSize(int sz, bool round_down_not_up)
 {
     int s=10;
     for (int i=0; i<nfontsizes; i++) {
   if ( fontsize[i] == sz ) {
       s = sz;
       break;
   } else if ( round_down_not_up ) {
       if ( fontsize[i] < sz )
     s = fontsize[i];
   } else {
       if ( fontsize[i] > sz ) {
     s = fontsize[i];
     break;
       }
   }
     }
 
     QFont f = editor->font();
     f.setPointSize(s);
     editor->setFont(f);
 
     zin->setEnabled(s != fontsize[nfontsizes-1]);
     zout->setEnabled(s != fontsize[0]);
 }
 
 void TextEdit::setBold(bool y)
 {
     QFont f = editor->font();
     f.setBold(y);
     editor->setFont(f);
 }
 
 void TextEdit::setItalic(bool y)
 {
     QFont f = editor->font();
     f.setItalic(y);
     editor->setFont(f);
 }
 
 void TextEdit::setWordWrap(bool y)
 {
     bool state = editor->edited();
     editor->setWordWrap(y ? QMultiLineEdit::WidgetWidth : QMultiLineEdit::NoWrap );
     editor->setEdited( state );
 }
 
 void TextEdit::fileNew()
 {
     if( !bFromDocView  ) {
         saveAs();
     }
     newFile(DocLnk());
 }
 
 void TextEdit::fileOpen()
 {
 //      if ( !save() ) {
 //    if ( QMessageBox::critical( this, tr( "Out of space" ),
 //              tr( "Text Editor was unable to\n"
 //            "save your changes.\n"
 //            "Free some space and try again.\n"
 //            "\nContinue anyway?" ),
 //              QMessageBox::Yes|QMessageBox::Escape,
 //              QMessageBox::No|QMessageBox::Default )
 //         != QMessageBox::Yes )
 //        return;
 //    else {
 //        delete doc;
 //        doc = 0;
 //    }
 //      }
     menu->hide();
     editBar->hide();
     searchBar->hide();
     clearWState (WState_Reserved1 );
     editorStack->raiseWidget( fileSelector );
     fileSelector->reread();
     updateCaption();
 }
 
 void TextEdit::newFileOpen()
 {
-    browseForFiles=new fileBrowser(this,"fileBrowser",TRUE,0, "*");
+    browseForFiles=new fileBrowser(this,"Open File",TRUE,0, "*");
     if( browseForFiles->exec() != -1 ) {
         QString selFile= browseForFiles->selectedFileName;
         QStringList fileList=browseForFiles->fileList;
         qDebug(selFile);
         QStringList::ConstIterator f;
         QString fileTemp;
         for (  f = fileList.begin(); f != fileList.end(); f++ ) {
             fileTemp = *f;
             fileTemp.right( fileTemp.length()-5);
             QString  fileName = fileTemp;
             if( fileName != "Unnamed" || fileName != "Empty Text"  ) {
                 currentFileName = fileName;
                 qDebug("please open "+currentFileName);
                 openFile(fileName );
             }
         }
     }
     delete browseForFiles;
     editor->setEdited( true );
 }
 
 #if 0
 void TextEdit::slotFind()
 {
     FindDialog frmFind( "Text Editor", this );
     connect( &frmFind, SIGNAL(signalFindClicked(const QString &, bool, bool, int)),
        editor, SLOT(slotDoFind( const QString&,bool,bool)));
 
     //case sensitive, backwards, [category]
 
     connect( editor, SIGNAL(notFound()),
        &frmFind, SLOT(slotNotFound()) );
     connect( editor, SIGNAL(searchWrapped()),
        &frmFind, SLOT(slotWrapAround()) );
 
     frmFind.exec();
 
 
 }
 #endif
 
 void TextEdit::fileRevert()
 {
     clear();
     fileOpen();
 }
 
 void TextEdit::editCut()
 {
 #ifndef QT_NO_CLIPBOARD
     editor->cut();
 #endif
 }
 
 void TextEdit::editCopy()
 {
 #ifndef QT_NO_CLIPBOARD
     editor->copy();
 #endif
 }
 
 void TextEdit::editPaste()
 {
 #ifndef QT_NO_CLIPBOARD
     editor->paste();
 #endif
 }
 
 void TextEdit::editFind()
 {
     searchBar->show();
     searchVisible = TRUE;
     searchEdit->setFocus();
 }
 
 void TextEdit::findNext()
 {
     editor->find( searchEdit->text(), FALSE, FALSE );
 
 }
 
 void TextEdit::findClose()
 {
     searchVisible = FALSE;
     searchBar->hide();
 }
 
 void TextEdit::search()
 {
     editor->find( searchEdit->text(), FALSE, FALSE );
 }
 
 void TextEdit::newFile( const DocLnk &f )
 {
     DocLnk nf = f;
     nf.setType("text/plain");
@@ -670,193 +670,193 @@ void TextEdit::openFile( const DocLnk &f )
     if ( doc )
   delete doc;
     doc = new DocLnk(f);
     editor->setText(txt);
     editor->setEdited( false);
     qDebug("openFile doclnk "+currentFileName);
     doc->setName(currentFileName);
     updateCaption();
 }
 
 void TextEdit::showEditTools()
 {
 //        if ( !doc )
 //      close();
 //    clear();
     fileSelector->hide();
     menu->show();
     editBar->show();
     if ( searchVisible )
   searchBar->show();
 //    updateCaption();
     editorStack->raiseWidget( editor );
     setWState (WState_Reserved1 );
 }
 
 /*!
   unprompted save */
 bool TextEdit::save()
 {
     QString file = doc->file();
     QString name= doc->name();
 
     QString rt = editor->text();
     currentFileName= name ;
     qDebug("saveFile "+currentFileName);
 
     struct stat buf;
     mode_t mode;
     stat(file.latin1(), &buf);
     mode = buf.st_mode;
 
     doc->setName( name);
     FileManager fm;
     if ( !fm.saveFile( *doc, rt ) ) {
         return false;
     }
     editor->setEdited( false );
 
     chmod( file.latin1(), mode);
     return true;
 }
 
 /*!
   prompted 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;
 //      }
     if ( !editor->edited() ) {
         delete doc;
         doc = 0;
         return true;
     }
 
     QString rt = editor->text();
     qDebug(currentFileName);
     
     if( currentFileName.isEmpty() || currentFileName == "Unnamed") {
         qDebug("do silly TT filename thing");
         if ( doc->name().isEmpty() ) {
             QString pt = rt.simplifyWhiteSpace();
             int i = pt.find( ' ' );
             QString docname = pt;
             if ( i > 0 )
                 docname = pt.left( i );
               // remove "." at the beginning
             while( docname.startsWith( "." ) )
                 docname = docname.mid( 1 );
             docname.replace( QRegExp("/"), "_" );
               // cut the length. filenames longer than that don't make sense and something goes wrong when they get too long.
             if ( docname.length() > 40 )
                 docname = docname.left(40);
             if ( docname.isEmpty() )
                 docname = "Unnamed";
             doc->setName(docname);
             currentFileName=docname;
         }
     }
 
     
-    fileSaveDlg=new fileSaver(this,"SaveFile",TRUE, 0, currentFileName);
+    fileSaveDlg=new fileSaver(this,"Save File",TRUE, 0, currentFileName);
     qDebug("wanna save filename "+currentFileName);
     fileSaveDlg->exec();
     if( fileSaveDlg->result() == 1 ) {
         QString fileNm=fileSaveDlg->selectedFileName;
         qDebug("saving filename "+fileNm);
         QFileInfo fi(fileNm);
         currentFileName=fi.fileName();
         if(doc) {
             qDebug("doclnk exists");
 //        QString file = doc->file();
 //        doc->removeFiles();
             delete doc;
             DocLnk nf;
             nf.setType("text/plain");
             nf.setFile( fileNm);
             doc = new DocLnk(nf);
 //        editor->setText(rt);
             qDebug("openFile doclnk "+currentFileName);
             doc->setName( currentFileName);
             updateCaption( currentFileName);
 
             FileManager fm;
             if ( !fm.saveFile( *doc, rt ) ) {
                 return false;
             }
             if( fileSaveDlg->filePermCheck->isChecked() ) {
                 filePermissions *filePerm;
                 filePerm = new filePermissions(this, "Permissions",true,0,(const QString &)fileNm);
                 filePerm->exec();
                 editor->setEdited( false );
                 if( filePerm)
                     delete  filePerm;
             }
         }
     }
 
     if(fileSaveDlg)
         delete fileSaveDlg;
     return true;
 }
 
 void TextEdit::clear()
 {
     delete doc;
     doc = 0;
     editor->clear();
 }
 
 void TextEdit::updateCaption( const QString &name )
 {
     if ( !doc )
   setCaption( tr("Text Editor") );
     else {
   QString s = name;
   if ( s.isNull() )
       s = doc->name();
   if ( s.isEmpty()  ) {
       s = tr( "Unnamed" );
        currentFileName=s;
   }
 
   setCaption( s + " - " + tr("Text Editor") );
     }
 }
 
 void TextEdit::setDocument(const QString& fileref)
 {
     bFromDocView = TRUE;
     openFile(fileref);
 //  bFromDocView = TRUE;
 //         openFile(DocLnk(fileref));
 //    showEditTools();
 }
 
 void TextEdit::closeEvent( QCloseEvent *e )
 {
     if ( editorStack->visibleWidget() == fileSelector && !bFromDocView ) {
         e->ignore();
         repaint();
 //        fileRevert();
   
     } else {
         bFromDocView = FALSE;
         e->accept();
     }
 }
 
 void TextEdit::accept()
 {
     save();
     close();
 //    fileOpen(); //godamn thats obnoxious! lemme out!!!
 }
 
 void TextEdit::changeFont() {
     FontDatabase fdb;