summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/apps/textedit/textedit.cpp20
1 files changed, 6 insertions, 14 deletions
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp
index 834971a..8004771 100644
--- a/core/apps/textedit/textedit.cpp
+++ b/core/apps/textedit/textedit.cpp
@@ -259,25 +259,24 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
259 a->addTo( file ); 259 a->addTo( file );
260 260
261 a = new QAction( tr( "Open" ), Resource::loadPixmap( "fileopen" ), QString::null, 0, this, 0 ); 261 a = new QAction( tr( "Open" ), Resource::loadPixmap( "fileopen" ), QString::null, 0, this, 0 );
262 connect( a, SIGNAL( activated() ), this, SLOT( fileOpen() ) ); 262 connect( a, SIGNAL( activated() ), this, SLOT( fileOpen() ) );
263// a->addTo( bar ); 263// a->addTo( bar );
264 a->addTo( file ); 264 a->addTo( file );
265 265
266 a = new QAction( tr( "Browse" ), Resource::loadPixmap( "fileopen" ), QString::null, 0, this, 0 ); 266 a = new QAction( tr( "Browse" ), Resource::loadPixmap( "fileopen" ), QString::null, 0, this, 0 );
267 connect( a, SIGNAL( activated() ), this, SLOT( newFileOpen() ) ); 267 connect( a, SIGNAL( activated() ), this, SLOT( newFileOpen() ) );
268 a->addTo( bar ); 268 a->addTo( bar );
269 a->addTo( file ); 269 a->addTo( file );
270 270
271//
272 a = new QAction( tr( "Save" ), QPixmap(( const char** ) filesave_xpm ) , QString::null, 0, this, 0 ); 271 a = new QAction( tr( "Save" ), QPixmap(( const char** ) filesave_xpm ) , QString::null, 0, this, 0 );
273 connect( a, SIGNAL( activated() ), this, SLOT( save() ) ); 272 connect( a, SIGNAL( activated() ), this, SLOT( save() ) );
274// a->addTo( bar ); 273// a->addTo( bar );
275 file->insertSeparator(); 274 file->insertSeparator();
276 a->addTo( file ); 275 a->addTo( file );
277 276
278 a = new QAction( tr( "Save As" ), QPixmap(( const char** ) filesave_xpm ) , QString::null, 0, this, 0 ); 277 a = new QAction( tr( "Save As" ), QPixmap(( const char** ) filesave_xpm ) , QString::null, 0, this, 0 );
279 connect( a, SIGNAL( activated() ), this, SLOT( saveAs() ) ); 278 connect( a, SIGNAL( activated() ), this, SLOT( saveAs() ) );
280 a->addTo( file ); 279 a->addTo( file );
281 280
282 a = new QAction( tr( "Cut" ), Resource::loadPixmap( "cut" ), QString::null, 0, this, 0 ); 281 a = new QAction( tr( "Cut" ), Resource::loadPixmap( "cut" ), QString::null, 0, this, 0 );
283 connect( a, SIGNAL( activated() ), this, SLOT( editCut() ) ); 282 connect( a, SIGNAL( activated() ), this, SLOT( editCut() ) );
@@ -395,34 +394,26 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
395 394
396 cfg.setGroup("Font"); 395 cfg.setGroup("Font");
397 QString family = cfg.readEntry("Family", fontInfo.family()); 396 QString family = cfg.readEntry("Family", fontInfo.family());
398 QString style = cfg.readEntry("Style", fdb.styleString(defaultFont)); 397 QString style = cfg.readEntry("Style", fdb.styleString(defaultFont));
399 int i_size = cfg.readNumEntry("Size", fontInfo.pointSize()/10); 398 int i_size = cfg.readNumEntry("Size", fontInfo.pointSize()/10);
400 QString charSet = cfg.readEntry("CharSet", QFont::encodingName( fontInfo.charSet()) ); 399 QString charSet = cfg.readEntry("CharSet", QFont::encodingName( fontInfo.charSet()) );
401 400
402 defaultFont = fdb.font(family,style,i_size,charSet); 401 defaultFont = fdb.font(family,style,i_size,charSet);
403 editor->setFont( defaultFont); 402 editor->setFont( defaultFont);
404 403
405 wa->setOn(wrap); 404 wa->setOn(wrap);
406 updateCaption(); 405 updateCaption();
407 if( qApp->argc() > 1 ) { 406
408 for (int i=1;i< qApp->argc();i++) { 407 fileNew();
409 QString tmp;
410 currentFileName = tmp.sprintf("%s",qApp->argv()[i]);
411 qDebug(currentFileName);
412 setDocument( currentFileName );
413 }
414 }
415 else
416 fileNew();
417} 408}
418 409
419TextEdit::~TextEdit() 410TextEdit::~TextEdit()
420{ 411{
421 saveAs(); 412 saveAs();
422 413
423 Config cfg("TextEdit"); 414 Config cfg("TextEdit");
424 cfg.setGroup("View"); 415 cfg.setGroup("View");
425 QFont f = editor->font(); 416 QFont f = editor->font();
426 cfg.writeEntry("FontSize",f.pointSize()); 417 cfg.writeEntry("FontSize",f.pointSize());
427 cfg.writeEntry("Bold",f.bold()); 418 cfg.writeEntry("Bold",f.bold());
428 cfg.writeEntry("Italic",f.italic()); 419 cfg.writeEntry("Italic",f.italic());
@@ -617,25 +608,25 @@ void TextEdit::search()
617 editor->find( searchEdit->text(), FALSE, FALSE ); 608 editor->find( searchEdit->text(), FALSE, FALSE );
618} 609}
619 610
620void TextEdit::newFile( const DocLnk &f ) 611void TextEdit::newFile( const DocLnk &f )
621{ 612{
622 DocLnk nf = f; 613 DocLnk nf = f;
623 nf.setType("text/plain"); 614 nf.setType("text/plain");
624 clear(); 615 clear();
625 editorStack->raiseWidget( editor ); 616 editorStack->raiseWidget( editor );
626 setWState (WState_Reserved1 ); 617 setWState (WState_Reserved1 );
627 editor->setFocus(); 618 editor->setFocus();
628 doc = new DocLnk(nf); 619 doc = new DocLnk(nf);
629// updateCaption(); 620 updateCaption(currentFileName);
630} 621}
631 622
632void TextEdit::openFile( const QString &f ) 623void TextEdit::openFile( const QString &f )
633{ 624{
634 bFromDocView = TRUE; 625 bFromDocView = TRUE;
635 DocLnk nf; 626 DocLnk nf;
636 nf.setType("text/plain"); 627 nf.setType("text/plain");
637 nf.setFile(f); 628 nf.setFile(f);
638 openFile(nf); 629 openFile(nf);
639 showEditTools(); 630 showEditTools();
640 // Show filename in caption 631 // Show filename in caption
641 QString name = f; 632 QString name = f;
@@ -759,36 +750,37 @@ void TextEdit::clear()
759 doc = 0; 750 doc = 0;
760 editor->clear(); 751 editor->clear();
761} 752}
762 753
763void TextEdit::updateCaption( const QString &name ) 754void TextEdit::updateCaption( const QString &name )
764{ 755{
765 if ( !doc ) 756 if ( !doc )
766 setCaption( tr("Text Editor") ); 757 setCaption( tr("Text Editor") );
767 else { 758 else {
768 QString s = name; 759 QString s = name;
769 if ( s.isNull() ) 760 if ( s.isNull() )
770 s = doc->name(); 761 s = doc->name();
771 if ( s.isEmpty() ) { 762 if ( s.isEmpty() ) {
772 s = tr( "Unnamed" ); 763 s = tr( "Unnamed" );
773 currentFileName=s; 764 currentFileName=s;
774 } 765 }
766
775 setCaption( s + " - " + tr("Text Editor") ); 767 setCaption( s + " - " + tr("Text Editor") );
776 } 768 }
777} 769}
778 770
779void TextEdit::setDocument(const QString& fileref) 771void TextEdit::setDocument(const QString& fileref)
780{ 772{
781 bFromDocView = TRUE; 773 bFromDocView = TRUE;
782 openFile(DocLnk(fileref)); 774 openFile(DocLnk(fileref));
783// showEditTools(); 775// showEditTools();
784} 776}
785 777
786void TextEdit::closeEvent( QCloseEvent *e ) 778void TextEdit::closeEvent( QCloseEvent *e )
787{ 779{
788 if ( editorStack->visibleWidget() == fileSelector && !bFromDocView ) { 780 if ( editorStack->visibleWidget() == fileSelector && !bFromDocView ) {
789 e->ignore(); 781 e->ignore();
790 repaint(); 782 repaint();
791// fileRevert(); 783// fileRevert();
792 784
793 } else { 785 } else {
794 bFromDocView = FALSE; 786 bFromDocView = FALSE;