-rw-r--r-- | core/apps/textedit/textedit.cpp | 20 |
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 | |||
@@ -268,7 +268,6 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) | |||
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 ); |
@@ -404,16 +403,8 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) | |||
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 | ||
419 | TextEdit::~TextEdit() | 410 | TextEdit::~TextEdit() |
@@ -626,7 +617,7 @@ void TextEdit::newFile( const DocLnk &f ) | |||
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 | ||
632 | void TextEdit::openFile( const QString &f ) | 623 | void TextEdit::openFile( const QString &f ) |
@@ -768,10 +759,11 @@ void TextEdit::updateCaption( const QString &name ) | |||
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 | } |
@@ -779,7 +771,7 @@ void TextEdit::updateCaption( const QString &name ) | |||
779 | void TextEdit::setDocument(const QString& fileref) | 771 | void 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 | ||