summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/apps/textedit/textedit.cpp41
1 files changed, 21 insertions, 20 deletions
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp
index 7b50a6c..6844023 100644
--- a/core/apps/textedit/textedit.cpp
+++ b/core/apps/textedit/textedit.cpp
@@ -366,103 +366,103 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
a = new QAction( tr( "Find Next" ), Resource::loadPixmap( "next" ), QString::null, 0, this, 0 );
connect( a, SIGNAL( activated() ), this, SLOT( findNext() ) );
a->addTo( searchBar );
a->addTo( edit );
a = new QAction( tr( "Close Find" ), Resource::loadPixmap( "close" ), QString::null, 0, this, 0 );
connect( a, SIGNAL( activated() ), this, SLOT( findClose() ) );
a->addTo( searchBar );
edit->insertSeparator();
a = new QAction( tr( "Delete" ), Resource::loadPixmap( "close" ), QString::null, 0, this, 0 );
connect( a, SIGNAL( activated() ), this, SLOT( editDelete() ) );
a->addTo( edit );
searchBar->hide();
editor = new QpeEditor( this );
setCentralWidget( editor );
editor->setFrameStyle( QFrame::Panel | QFrame::Sunken );
connect( editor, SIGNAL( textChanged() ), this, SLOT( editorChanged() ) );
Config cfg("TextEdit");
- cfg. setGroup ( "Font" );
+ cfg. setGroup ( "Font" );
QFont defaultFont = editor-> font ( );
QString family = cfg. readEntry ( "Family", defaultFont. family ( ));
int size = cfg. readNumEntry ( "Size", defaultFont. pointSize ( ));
int weight = cfg. readNumEntry ( "Weight", defaultFont. weight ( ));
bool italic = cfg. readBoolEntry ( "Italic", defaultFont. italic ( ));
defaultFont = QFont ( family, size, weight, italic );
editor-> setFont ( defaultFont );
updateCaption();
cfg.setGroup ( "View" );
useAdvancedFeatures = cfg. readBoolEntry ( "AdvancedFeatures", false );
if ( useAdvancedFeatures )
nAdvanced-> setOn ( true );
- bool wrap = cfg. readBoolEntry ( "Wrap", true );
- wa-> setOn ( wrap );
+ bool wrap = cfg. readBoolEntry ( "Wrap", true );
+ wa-> setOn ( wrap );
setWordWrap ( wrap );
if(cfg.readEntry("startNew","TRUE") == "TRUE") {
nStart->setOn(TRUE);
fileNew();
} else {
fileOpen();
}
viewSelection = cfg.readNumEntry( "FileView", 0 );
}
TextEdit::~TextEdit() {
if( edited1 & !useAdvancedFeatures )
saveAs();
}
void TextEdit::cleanUp() {
- qDebug("cleanUp");// save();
-
+ qDebug("cleanUp");// save();
+
Config cfg ( "TextEdit" );
cfg. setGroup ( "Font" );
QFont f = editor->font();
cfg. writeEntry ( "Family", f. family ( ));
cfg. writeEntry ( "Size", f. pointSize ( ));
cfg. writeEntry ( "Weight", f. weight ( ));
cfg. writeEntry ( "Italic", f. italic ( ));
cfg. setGroup ( "View" );
cfg. writeEntry ( "Wrap", editor-> wordWrap ( ) == QMultiLineEdit::WidgetWidth );
cfg. writeEntry ( "FileView", viewSelection );
- cfg. writeEntry ( "AdvancedFeatures", useAdvancedFeatures );
+ cfg. writeEntry ( "AdvancedFeatures", useAdvancedFeatures );
}
void TextEdit::accept() {
if( edited1)
saveAs();
exit(0);
}
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;
@@ -603,63 +603,64 @@ void TextEdit::findClose() {
void TextEdit::search() {
editor->find( searchEdit->text(), FALSE, FALSE );
}
void TextEdit::newFile( const DocLnk &f ) {
DocLnk nf = f;
nf.setType("text/plain");
clear();
setWState (WState_Reserved1 );
editor->setFocus();
doc = new DocLnk(nf);
currentFileName = "Unnamed";
qDebug("newFile "+currentFileName);
updateCaption( currentFileName);
// editor->setEdited( FALSE);
}
void TextEdit::openFile( const QString &f ) {
qDebug("filename is "+ f);
QString filer;
// bFromDocView = TRUE;
if(f.find(".desktop",0,TRUE) != -1 && useAdvancedFeatures) {
switch ( QMessageBox::warning(this,tr("Text Editor"),
- tr("Text Editor has detected<BR>you selected a <B>.desktop</B> file.<BR>Open <B>.desktop</B> file or <B>linked</B> file?"),
+ tr("Text Editor has detected<BR>you selected a <B>.desktop</B>
+file.<BR>Open <B>.desktop</B> file or <B>linked</B> file?"),
tr(".desktop File"),tr("Linked Document"),0,1,1) ) {
case 0:
filer = f;
break;
case 1:
DocLnk sf(f);
filer = sf.file();
break;
}
} else {
- DocLnk sf(f);
- filer = sf.file();
-// filer = f;
-// fileIs = TRUE;
+ DocLnk sf(f);
+ filer = sf.file();
+ if(filer.right(1) == "/")
+ filer = f;
}
DocLnk nf;
nf.setType("text/plain");
nf.setFile(filer);
currentFileName=filer;
QFileInfo fi( currentFileName);
nf.setName(fi.baseName());
qDebug("openFile string "+currentFileName);
openFile(nf);
showEditTools();
// Show filename in caption
QString name = filer;
int sep = name.findRev( '/' );
if ( sep > 0 )
name = name.mid( sep+1 );
updateCaption( name );
}
void TextEdit::openFile( const DocLnk &f ) {
// clear();
// bFromDocView = TRUE;
FileManager fm;
@@ -861,58 +862,58 @@ 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") );
}
}
void TextEdit::setDocument(const QString& fileref) {
bFromDocView = TRUE;
openFile(fileref);
editor->setEdited(TRUE);
edited1=FALSE;
edited=TRUE;
doSearchBar();
}
void TextEdit::closeEvent( QCloseEvent *e ) {
bFromDocView = FALSE;
e->accept();
}
void TextEdit::changeFont() {
- QDialog *d = new QDialog ( this, "FontDialog", true );
- d-> setCaption ( tr( "Choose font" ));
- QBoxLayout *lay = new QVBoxLayout ( d );
- OFontSelector *ofs = new OFontSelector ( true, d );
- lay-> addWidget ( ofs );
- ofs-> setSelectedFont ( editor-> font ( ));
-
- d-> showMaximized ( );
+ QDialog *d = new QDialog ( this, "FontDialog", true );
+ d-> setCaption ( tr( "Choose font" ));
+ QBoxLayout *lay = new QVBoxLayout ( d );
+ OFontSelector *ofs = new OFontSelector ( true, d );
+ lay-> addWidget ( ofs );
+ ofs-> setSelectedFont ( editor-> font ( ));
+
+ d-> showMaximized ( );
if ( d-> exec ( ) == QDialog::Accepted )
- editor-> setFont ( ofs-> selectedFont ( ));
+ editor-> setFont ( ofs-> selectedFont ( ));
delete d;
}
void TextEdit::editDelete() {
switch ( QMessageBox::warning(this,tr("Text Editor"),tr("Do you really want<BR>to <B>delete</B> the current file\nfrom the disk?<BR>This is <B>irreversable!!</B>"),tr("Yes"),tr("No"),0,0,1) ) {
case 0:
if(doc) {
doc->removeFiles();
clear();
setCaption( tr("Text Editor") );
}
break;
case 1:
// exit
break;
};
}
void TextEdit::changeStartConfig( bool b ) {
Config cfg("TextEdit");
cfg.setGroup("View");
if(b) {