author | bipolar <bipolar> | 2002-03-08 00:12:12 (UTC) |
---|---|---|
committer | bipolar <bipolar> | 2002-03-08 00:12:12 (UTC) |
commit | 11b56113b6641e0b85c6015eafab802dd7663198 (patch) (unidiff) | |
tree | 1899707c9144a342519acf9693ec69d2d4edffc7 /core/apps | |
parent | 50f8f55346f369787063f42c571d2dc832eb58aa (diff) | |
download | opie-11b56113b6641e0b85c6015eafab802dd7663198.zip opie-11b56113b6641e0b85c6015eafab802dd7663198.tar.gz opie-11b56113b6641e0b85c6015eafab802dd7663198.tar.bz2 |
ljp: added startup option,a dn fixed save when closing with no file edited
-rw-r--r-- | core/apps/textedit/fileSaver.cpp | 2 | ||||
-rw-r--r-- | core/apps/textedit/textedit.cpp | 88 | ||||
-rw-r--r-- | core/apps/textedit/textedit.h | 6 |
3 files changed, 69 insertions, 27 deletions
diff --git a/core/apps/textedit/fileSaver.cpp b/core/apps/textedit/fileSaver.cpp index d78f2e8..4e80735 100644 --- a/core/apps/textedit/fileSaver.cpp +++ b/core/apps/textedit/fileSaver.cpp | |||
@@ -72,13 +72,13 @@ fileSaver::fileSaver( QWidget* parent, const char* name, bool modal, WFlags fl | |||
72 | 72 | ||
73 | // tmpFileName=fi.FilePath(); | 73 | // tmpFileName=fi.FilePath(); |
74 | // qDebug( tmpFileName); | 74 | // qDebug( tmpFileName); |
75 | currentDir.setPath( QDir::currentDirPath() ); | 75 | currentDir.setPath( QDir::currentDirPath() ); |
76 | populateList(); | 76 | populateList(); |
77 | move(0,15); | 77 | move(0,15); |
78 | 78 | fileEdit->setFocus(); | |
79 | } | 79 | } |
80 | 80 | ||
81 | fileSaver::~fileSaver() | 81 | fileSaver::~fileSaver() |
82 | { | 82 | { |
83 | } | 83 | } |
84 | 84 | ||
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp index 0f19da9..03f3a1e 100644 --- a/core/apps/textedit/textedit.cpp +++ b/core/apps/textedit/textedit.cpp | |||
@@ -249,13 +249,13 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) | |||
249 | bar->setHorizontalStretchable( TRUE ); | 249 | bar->setHorizontalStretchable( TRUE ); |
250 | menu = bar; | 250 | menu = bar; |
251 | 251 | ||
252 | QPEMenuBar *mb = new QPEMenuBar( bar ); | 252 | QPEMenuBar *mb = new QPEMenuBar( bar ); |
253 | QPopupMenu *file = new QPopupMenu( this ); | 253 | QPopupMenu *file = new QPopupMenu( this ); |
254 | QPopupMenu *edit = new QPopupMenu( this ); | 254 | QPopupMenu *edit = new QPopupMenu( this ); |
255 | QPopupMenu *font = new QPopupMenu( this ); | 255 | font = new QPopupMenu( this ); |
256 | 256 | ||
257 | bar = new QPEToolBar( this ); | 257 | bar = new QPEToolBar( this ); |
258 | editBar = bar; | 258 | editBar = bar; |
259 | 259 | ||
260 | QAction *a = new QAction( tr( "New" ), Resource::loadPixmap( "new" ), QString::null, 0, this, 0 ); | 260 | QAction *a = new QAction( tr( "New" ), Resource::loadPixmap( "new" ), QString::null, 0, this, 0 ); |
261 | connect( a, SIGNAL( activated() ), this, SLOT( fileNew() ) ); | 261 | connect( a, SIGNAL( activated() ), this, SLOT( fileNew() ) ); |
@@ -346,12 +346,18 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) | |||
346 | wa->setToggleAction(TRUE); | 346 | wa->setToggleAction(TRUE); |
347 | wa->addTo( font ); | 347 | wa->addTo( font ); |
348 | 348 | ||
349 | font->insertSeparator(); | 349 | font->insertSeparator(); |
350 | font->insertItem("Font", this, SLOT(changeFont()) ); | 350 | font->insertItem("Font", this, SLOT(changeFont()) ); |
351 | 351 | ||
352 | font->insertSeparator(); | ||
353 | nStart = new QAction( tr("Start with new file"), QString::null, 0, this, 0 ); | ||
354 | connect( nStart, SIGNAL( toggled(bool) ), this, SLOT( changeStartConfig(bool) ) ); | ||
355 | nStart->setToggleAction(TRUE); | ||
356 | nStart->addTo( font ); | ||
357 | |||
352 | mb->insertItem( tr( "File" ), file ); | 358 | mb->insertItem( tr( "File" ), file ); |
353 | mb->insertItem( tr( "Edit" ), edit ); | 359 | mb->insertItem( tr( "Edit" ), edit ); |
354 | mb->insertItem( tr( "View" ), font ); | 360 | mb->insertItem( tr( "View" ), font ); |
355 | 361 | ||
356 | searchBar = new QPEToolBar(this); | 362 | searchBar = new QPEToolBar(this); |
357 | addToolBar( searchBar, "Search", QMainWindow::Top, TRUE ); | 363 | addToolBar( searchBar, "Search", QMainWindow::Top, TRUE ); |
@@ -411,13 +417,20 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) | |||
411 | defaultFont = fdb.font(family,style,i_size,charSet); | 417 | defaultFont = fdb.font(family,style,i_size,charSet); |
412 | editor->setFont( defaultFont); | 418 | editor->setFont( defaultFont); |
413 | 419 | ||
414 | wa->setOn(wrap); | 420 | wa->setOn(wrap); |
415 | updateCaption(); | 421 | updateCaption(); |
416 | 422 | ||
417 | fileNew(); | 423 | cfg.setGroup("View"); |
424 | if(cfg.readEntry("startNew","TRUE") == "TRUE") { | ||
425 | nStart->setOn(TRUE); | ||
426 | fileNew(); | ||
427 | } else { | ||
428 | fileOpen(); | ||
429 | } | ||
430 | |||
418 | } | 431 | } |
419 | 432 | ||
420 | TextEdit::~TextEdit() | 433 | TextEdit::~TextEdit() |
421 | { | 434 | { |
422 | // save(); | 435 | // save(); |
423 | 436 | ||
@@ -694,32 +707,40 @@ void TextEdit::showEditTools() | |||
694 | 707 | ||
695 | /*! | 708 | /*! |
696 | unprompted save */ | 709 | unprompted save */ |
697 | bool TextEdit::save() | 710 | bool TextEdit::save() |
698 | { | 711 | { |
699 | QString file = doc->file(); | 712 | QString file = doc->file(); |
713 | qDebug(file); | ||
700 | QString name= doc->name(); | 714 | QString name= doc->name(); |
701 | 715 | qDebug(name); | |
702 | QString rt = editor->text(); | 716 | QString rt = editor->text(); |
703 | currentFileName= name ; | 717 | if( !rt.isEmpty() ) { |
704 | qDebug("saveFile "+currentFileName); | 718 | if(name.isEmpty()) { |
705 | 719 | saveAs(); | |
706 | struct stat buf; | 720 | } else { |
707 | mode_t mode; | 721 | currentFileName= name ; |
708 | stat(file.latin1(), &buf); | 722 | qDebug("saveFile "+currentFileName); |
709 | mode = buf.st_mode; | 723 | |
724 | struct stat buf; | ||
725 | mode_t mode; | ||
726 | stat(file.latin1(), &buf); | ||
727 | mode = buf.st_mode; | ||
728 | |||
729 | doc->setName( name); | ||
730 | FileManager fm; | ||
731 | if ( !fm.saveFile( *doc, rt ) ) { | ||
732 | return false; | ||
733 | } | ||
734 | editor->setEdited( false ); | ||
710 | 735 | ||
711 | doc->setName( name); | 736 | chmod( file.latin1(), mode); |
712 | FileManager fm; | 737 | } |
713 | if ( !fm.saveFile( *doc, rt ) ) { | 738 | return true; |
714 | return false; | ||
715 | } | 739 | } |
716 | editor->setEdited( false ); | 740 | return false; |
717 | |||
718 | chmod( file.latin1(), mode); | ||
719 | return true; | ||
720 | } | 741 | } |
721 | 742 | ||
722 | /*! | 743 | /*! |
723 | prompted save */ | 744 | prompted save */ |
724 | bool TextEdit::saveAs() | 745 | bool TextEdit::saveAs() |
725 | { | 746 | { |
@@ -760,31 +781,30 @@ bool TextEdit::saveAs() | |||
760 | doc->setName(docname); | 781 | doc->setName(docname); |
761 | currentFileName=docname; | 782 | currentFileName=docname; |
762 | } | 783 | } |
763 | } | 784 | } |
764 | 785 | ||
765 | 786 | ||
766 | fileSaveDlg=new fileSaver(this,"Save File",TRUE, 0, currentFileName); | 787 | fileSaveDlg=new fileSaver(this,"Save File As?",TRUE, 0, currentFileName); |
767 | qDebug("wanna save filename "+currentFileName); | 788 | qDebug("wanna save filename "+currentFileName); |
768 | fileSaveDlg->exec(); | 789 | fileSaveDlg->exec(); |
769 | if( fileSaveDlg->result() == 1 ) { | 790 | if( fileSaveDlg->result() == 1 ) { |
770 | QString fileNm=fileSaveDlg->selectedFileName; | 791 | QString fileNm=fileSaveDlg->selectedFileName; |
771 | qDebug("saving filename "+fileNm); | 792 | qDebug("saving filename "+fileNm); |
772 | QFileInfo fi(fileNm); | 793 | QFileInfo fi(fileNm); |
773 | currentFileName=fi.fileName(); | 794 | currentFileName=fi.fileName(); |
774 | if(doc) { | 795 | if(doc) { |
775 | qDebug("doclnk exists"); | ||
776 | // QString file = doc->file(); | 796 | // QString file = doc->file(); |
777 | // doc->removeFiles(); | 797 | // doc->removeFiles(); |
778 | delete doc; | 798 | delete doc; |
779 | DocLnk nf; | 799 | DocLnk nf; |
780 | nf.setType("text/plain"); | 800 | nf.setType("text/plain"); |
781 | nf.setFile( fileNm); | 801 | nf.setFile( fileNm); |
782 | doc = new DocLnk(nf); | 802 | doc = new DocLnk(nf); |
783 | // editor->setText(rt); | 803 | // editor->setText(rt); |
784 | qDebug("openFile doclnk "+currentFileName); | 804 | // qDebug("openFile doclnk "+currentFileName); |
785 | doc->setName( currentFileName); | 805 | doc->setName( currentFileName); |
786 | updateCaption( currentFileName); | 806 | updateCaption( currentFileName); |
787 | 807 | ||
788 | FileManager fm; | 808 | FileManager fm; |
789 | if ( !fm.saveFile( *doc, rt ) ) { | 809 | if ( !fm.saveFile( *doc, rt ) ) { |
790 | return false; | 810 | return false; |
@@ -852,16 +872,21 @@ void TextEdit::closeEvent( QCloseEvent *e ) | |||
852 | bFromDocView = FALSE; | 872 | bFromDocView = FALSE; |
853 | e->accept(); | 873 | e->accept(); |
854 | } | 874 | } |
855 | } | 875 | } |
856 | 876 | ||
857 | void TextEdit::accept() | 877 | void TextEdit::accept() |
858 | { | 878 | { |
859 | save(); | 879 | QString file = doc->file(); |
860 | close(); | 880 | if (file.find("_.txt",0,TRUE) ==-1) |
861 | // fileOpen(); //godamn thats obnoxious! lemme out!!! | 881 | save(); |
882 | else { | ||
883 | QFile(file).remove(); | ||
884 | } | ||
885 | exit(0); | ||
886 | |||
862 | } | 887 | } |
863 | 888 | ||
864 | void TextEdit::changeFont() { | 889 | void TextEdit::changeFont() { |
865 | FontDatabase fdb; | 890 | FontDatabase fdb; |
866 | QFont defaultFont=editor->font(); | 891 | QFont defaultFont=editor->font(); |
867 | QFontInfo fontInfo(defaultFont); | 892 | QFontInfo fontInfo(defaultFont); |
@@ -897,6 +922,19 @@ void TextEdit::editDelete() | |||
897 | break; | 922 | break; |
898 | case 1: | 923 | case 1: |
899 | // exit | 924 | // exit |
900 | break; | 925 | break; |
901 | }; | 926 | }; |
902 | } | 927 | } |
928 | |||
929 | void TextEdit::changeStartConfig( bool b ) { | ||
930 | |||
931 | Config cfg("TextEdit"); | ||
932 | cfg.setGroup("View"); | ||
933 | if(b) { | ||
934 | qDebug("bool"); | ||
935 | cfg.writeEntry("startNew","TRUE"); | ||
936 | } else { | ||
937 | cfg.writeEntry("startNew","FALSE"); | ||
938 | } | ||
939 | update(); | ||
940 | } | ||
diff --git a/core/apps/textedit/textedit.h b/core/apps/textedit/textedit.h index 781061a..fb58738 100644 --- a/core/apps/textedit/textedit.h +++ b/core/apps/textedit/textedit.h | |||
@@ -31,41 +31,45 @@ | |||
31 | 31 | ||
32 | #include <qmainwindow.h> | 32 | #include <qmainwindow.h> |
33 | #include <qmultilineedit.h> | 33 | #include <qmultilineedit.h> |
34 | #include <qlist.h> | 34 | #include <qlist.h> |
35 | #include <qmap.h> | 35 | #include <qmap.h> |
36 | 36 | ||
37 | class QAction; | ||
37 | class QWidgetStack; | 38 | class QWidgetStack; |
38 | class QToolButton; | 39 | class QToolButton; |
39 | class QPopupMenu; | 40 | class QPopupMenu; |
40 | class QToolBar; | 41 | class QToolBar; |
41 | class QLineEdit; | 42 | class QLineEdit; |
42 | class QAction; | 43 | class QAction; |
43 | class FileSelector; | 44 | class FileSelector; |
44 | class QpeEditor; | 45 | class QpeEditor; |
46 | class QPopupMenu; | ||
45 | 47 | ||
46 | class TextEdit : public QMainWindow | 48 | class TextEdit : public QMainWindow |
47 | { | 49 | { |
48 | Q_OBJECT | 50 | Q_OBJECT |
49 | 51 | ||
50 | public: | 52 | public: |
51 | TextEdit( QWidget *parent = 0, const char *name = 0, WFlags f = 0 ); | 53 | TextEdit( QWidget *parent = 0, const char *name = 0, WFlags f = 0 ); |
52 | ~TextEdit(); | 54 | ~TextEdit(); |
53 | 55 | QPopupMenu *font; | |
56 | QAction *nStart; | ||
54 | void openFile( const QString & ); | 57 | void openFile( const QString & ); |
55 | 58 | ||
56 | protected: | 59 | protected: |
57 | void closeEvent( QCloseEvent *e ); | 60 | void closeEvent( QCloseEvent *e ); |
58 | 61 | ||
59 | private slots: | 62 | private slots: |
60 | void setDocument(const QString&); | 63 | void setDocument(const QString&); |
61 | void changeFont(); | 64 | void changeFont(); |
62 | void fileNew(); | 65 | void fileNew(); |
63 | void fileRevert(); | 66 | void fileRevert(); |
64 | void fileOpen(); | 67 | void fileOpen(); |
65 | void newFileOpen(); | 68 | void newFileOpen(); |
69 | void changeStartConfig(bool); | ||
66 | bool save(); | 70 | bool save(); |
67 | bool saveAs(); | 71 | bool saveAs(); |
68 | 72 | ||
69 | 73 | ||
70 | void editCut(); | 74 | void editCut(); |
71 | void editCopy(); | 75 | void editCopy(); |