author | llornkcor <llornkcor> | 2002-11-29 00:54:12 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-11-29 00:54:12 (UTC) |
commit | 70c8fe38d9d65b75912c8b473c3940d2160cdde6 (patch) (unidiff) | |
tree | 8e307e814fa5960007f21afc27ad5da4a9493454 /core/apps/textedit | |
parent | 54b1bd8e8eaf5764b465f169d4ee1b9261659a11 (diff) | |
download | opie-70c8fe38d9d65b75912c8b473c3940d2160cdde6.zip opie-70c8fe38d9d65b75912c8b473c3940d2160cdde6.tar.gz opie-70c8fe38d9d65b75912c8b473c3940d2160cdde6.tar.bz2 |
removed open with fileselector, cause I hate it. Fixes opening through docs tab, and other annoyances
-rw-r--r-- | core/apps/textedit/textedit.cpp | 67 | ||||
-rw-r--r-- | core/apps/textedit/textedit.h | 1 |
2 files changed, 42 insertions, 26 deletions
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp index e978fa4..b199c81 100644 --- a/core/apps/textedit/textedit.cpp +++ b/core/apps/textedit/textedit.cpp | |||
@@ -240,13 +240,14 @@ static const int fontsize[nfontsizes] = {8,10,12,14,18,24}; | |||
240 | 240 | ||
241 | TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) | 241 | TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) |
242 | : QMainWindow( parent, name, f ), bFromDocView( false ) | 242 | : QMainWindow( parent, name, f ), bFromDocView( false ) |
243 | { | 243 | { |
244 | doc = 0; | 244 | doc = 0; |
245 | edited=false; | 245 | edited=false; |
246 | edited1=false; | 246 | fromSetDocument=false; |
247 | |||
247 | setToolBarsMovable( false ); | 248 | setToolBarsMovable( false ); |
248 | connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); | 249 | connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); |
249 | 250 | ||
250 | channel = new QCopChannel( "QPE/Application/textedit", this ); | 251 | channel = new QCopChannel( "QPE/Application/textedit", this ); |
251 | connect( channel, SIGNAL(received(const QCString&, const QByteArray&)), | 252 | connect( channel, SIGNAL(received(const QCString&, const QByteArray&)), |
252 | this, SLOT(receive(const QCString&, const QByteArray&)) ); | 253 | this, SLOT(receive(const QCString&, const QByteArray&)) ); |
@@ -266,23 +267,24 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) | |||
266 | 267 | ||
267 | bar = new QPEToolBar( this ); | 268 | bar = new QPEToolBar( this ); |
268 | editBar = bar; | 269 | editBar = bar; |
269 | 270 | ||
270 | QAction *a = new QAction( tr( "New" ), Resource::loadPixmap( "new" ), QString::null, 0, this, 0 ); | 271 | QAction *a = new QAction( tr( "New" ), Resource::loadPixmap( "new" ), QString::null, 0, this, 0 ); |
271 | connect( a, SIGNAL( activated() ), this, SLOT( fileNew() ) ); | 272 | connect( a, SIGNAL( activated() ), this, SLOT( fileNew() ) ); |
272 | a->addTo( bar ); | 273 | // a->addTo( bar ); |
273 | a->addTo( file ); | 274 | a->addTo( file ); |
274 | 275 | ||
275 | a = new QAction( tr( "Open" ), Resource::loadPixmap( "fileopen" ), QString::null, 0, this, 0 ); | 276 | a = new QAction( tr( "Open" ), Resource::loadPixmap( "fileopen" ), QString::null, 0, this, 0 ); |
276 | connect( a, SIGNAL( activated() ), this, SLOT( fileOpen() ) ); | 277 | connect( a, SIGNAL( activated() ), this, SLOT( fileOpen() ) ); |
277 | a->addTo( bar ); | 278 | a->addTo( bar ); |
278 | a->addTo( file ); | 279 | a->addTo( file ); |
279 | 280 | ||
280 | a = new QAction( tr( "Save" ), QPixmap(( const char** ) filesave_xpm ) , QString::null, 0, this, 0 ); | 281 | a = new QAction( tr( "Save" ), QPixmap(( const char** ) filesave_xpm ) , QString::null, 0, this, 0 ); |
281 | connect( a, SIGNAL( activated() ), this, SLOT( save() ) ); | 282 | connect( a, SIGNAL( activated() ), this, SLOT( save() ) ); |
282 | file->insertSeparator(); | 283 | file->insertSeparator(); |
284 | a->addTo( bar ); | ||
283 | a->addTo( file ); | 285 | a->addTo( file ); |
284 | 286 | ||
285 | a = new QAction( tr( "Save As" ), QPixmap(( const char** ) filesave_xpm ) , QString::null, 0, this, 0 ); | 287 | a = new QAction( tr( "Save As" ), QPixmap(( const char** ) filesave_xpm ) , QString::null, 0, this, 0 ); |
286 | connect( a, SIGNAL( activated() ), this, SLOT( saveAs() ) ); | 288 | connect( a, SIGNAL( activated() ), this, SLOT( saveAs() ) ); |
287 | a->addTo( file ); | 289 | a->addTo( file ); |
288 | 290 | ||
@@ -336,12 +338,13 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) | |||
336 | wa->addTo( advancedMenu); | 338 | wa->addTo( advancedMenu); |
337 | 339 | ||
338 | nStart = new QAction( tr("Start with new file"), QString::null, 0, this, 0 ); | 340 | nStart = new QAction( tr("Start with new file"), QString::null, 0, this, 0 ); |
339 | connect( nStart, SIGNAL( toggled(bool) ), this, SLOT( changeStartConfig(bool) ) ); | 341 | connect( nStart, SIGNAL( toggled(bool) ), this, SLOT( changeStartConfig(bool) ) ); |
340 | nStart->setToggleAction(true); | 342 | nStart->setToggleAction(true); |
341 | nStart->addTo( advancedMenu ); | 343 | nStart->addTo( advancedMenu ); |
344 | nStart->setEnabled(false); | ||
342 | 345 | ||
343 | nAdvanced = new QAction( tr("Prompt on Exit"), QString::null, 0, this, 0 ); | 346 | nAdvanced = new QAction( tr("Prompt on Exit"), QString::null, 0, this, 0 ); |
344 | connect( nAdvanced, SIGNAL( toggled(bool) ), this, SLOT( doPrompt(bool) ) ); | 347 | connect( nAdvanced, SIGNAL( toggled(bool) ), this, SLOT( doPrompt(bool) ) ); |
345 | nAdvanced->setToggleAction(true); | 348 | nAdvanced->setToggleAction(true); |
346 | nAdvanced->addTo( advancedMenu ); | 349 | nAdvanced->addTo( advancedMenu ); |
347 | 350 | ||
@@ -433,31 +436,34 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) | |||
433 | bool wrap = cfg. readBoolEntry ( "Wrap", true ); | 436 | bool wrap = cfg. readBoolEntry ( "Wrap", true ); |
434 | wa-> setOn ( wrap ); | 437 | wa-> setOn ( wrap ); |
435 | setWordWrap ( wrap ); | 438 | setWordWrap ( wrap ); |
436 | 439 | ||
437 | if( qApp->argc() > 1) { | 440 | if( qApp->argc() > 1) { |
438 | currentFileName=qApp->argv()[1]; | 441 | currentFileName=qApp->argv()[1]; |
439 | // qDebug("<<<<<<<<<<<<<<<<<<<<<<<< "+currentFileName+" %d",qApp->argc()); | 442 | |
440 | QFileInfo fi(currentFileName); | 443 | QFileInfo fi(currentFileName); |
441 | 444 | ||
442 | if(fi.baseName().left(1) == "") { | 445 | if(fi.baseName().left(1) == "") { |
443 | openDotFile(currentFileName); | 446 | openDotFile(currentFileName); |
444 | } else { | 447 | } else { |
445 | openFile(currentFileName); | 448 | openFile(currentFileName); |
446 | } | 449 | } |
447 | } else { | 450 | } else { |
448 | // qDebug("Do other thing"); | 451 | edited1=false; |
449 | if(startWithNew) { | 452 | |
453 | // if(startWithNew ) { | ||
450 | openDotFile(""); | 454 | openDotFile(""); |
451 | // fileNew(); | 455 | // fileNew(); |
452 | } else { | 456 | // } |
453 | fileOpen(); | 457 | // else { |
454 | } | 458 | // fileOpen(); |
459 | // } | ||
455 | } | 460 | } |
456 | 461 | ||
457 | viewSelection = cfg.readNumEntry( "FileView", 0 ); | 462 | viewSelection = cfg.readNumEntry( "FileView", 0 ); |
463 | // setCaption(tr("Text Editor")); | ||
458 | } | 464 | } |
459 | 465 | ||
460 | TextEdit::~TextEdit() { | 466 | TextEdit::~TextEdit() { |
461 | // qDebug("destr"); | 467 | // qDebug("destr"); |
462 | } | 468 | } |
463 | 469 | ||
@@ -692,13 +698,13 @@ void TextEdit::openDotFile( const QString &f ) { | |||
692 | 698 | ||
693 | void TextEdit::openFile( const QString &f ) { | 699 | void TextEdit::openFile( const QString &f ) { |
694 | qDebug("filename is "+ f); | 700 | qDebug("filename is "+ f); |
695 | QString filer; | 701 | QString filer; |
696 | QFileInfo fi( f); | 702 | QFileInfo fi( f); |
697 | // bFromDocView = true; | 703 | // bFromDocView = true; |
698 | if(f.find(".desktop",0,true) != -1 && !openDesktop) { | 704 | if(f.find(".desktop",0,true) != -1 && !openDesktop ) { |
699 | switch ( QMessageBox::warning(this,tr("Text Editor"), | 705 | switch ( QMessageBox::warning(this,tr("Text Editor"), |
700 | tr("Text Editor has detected<BR>you selected a <B>.desktop</B> | 706 | tr("Text Editor has detected<BR>you selected a <B>.desktop</B> |
701 | file.<BR>Open <B>.desktop</B> file or <B>linked</B> file?"), | 707 | file.<BR>Open <B>.desktop</B> file or <B>linked</B> file?"), |
702 | tr(".desktop File"),tr("Linked Document"),0,1,1) ) { | 708 | tr(".desktop File"),tr("Linked Document"),0,1,1) ) { |
703 | case 0: | 709 | case 0: |
704 | filer = f; | 710 | filer = f; |
@@ -823,12 +829,14 @@ bool TextEdit::save() { | |||
823 | return false; | 829 | return false; |
824 | } | 830 | } |
825 | 831 | ||
826 | /*! | 832 | /*! |
827 | prompted save */ | 833 | prompted save */ |
828 | bool TextEdit::saveAs() { | 834 | bool TextEdit::saveAs() { |
835 | if(caption() == tr("Text Editor")) | ||
836 | return false; | ||
829 | qDebug("saveAsFile " + currentFileName); | 837 | qDebug("saveAsFile " + currentFileName); |
830 | // case of nothing to save... | 838 | // case of nothing to save... |
831 | // if ( !doc && !currentFileName.isEmpty()) { | 839 | // if ( !doc && !currentFileName.isEmpty()) { |
832 | // //|| !bFromDocView) | 840 | // //|| !bFromDocView) |
833 | // qDebug("no doc"); | 841 | // qDebug("no doc"); |
834 | // return true; | 842 | // return true; |
@@ -960,25 +968,25 @@ void TextEdit::updateCaption( const QString &name ) { | |||
960 | } | 968 | } |
961 | 969 | ||
962 | void TextEdit::setDocument(const QString& fileref) { | 970 | void TextEdit::setDocument(const QString& fileref) { |
963 | if(fileref != "Unnamed") { | 971 | if(fileref != "Unnamed") { |
964 | currentFileName=fileref; | 972 | currentFileName=fileref; |
965 | qDebug("setDocument"); | 973 | qDebug("setDocument"); |
966 | QFileInfo fi(currentFileName); | 974 | QFileInfo fi(currentFileName); |
967 | qDebug("basename:"+fi.baseName()+": current filenmame "+currentFileName); | 975 | qDebug("basename:"+fi.baseName()+": current filenmame "+currentFileName); |
968 | if(fi.baseName().left(1) == "") { | 976 | if(fi.baseName().left(1) == "") { |
969 | // openDotFile(currentFileName); | 977 | // openDotFile(currentFileName); |
970 | } else { | 978 | } else { |
971 | qDebug("setDoc open"); | 979 | qDebug("setDoc open"); |
972 | bFromDocView = true; | 980 | bFromDocView = true; |
973 | openFile(fileref); | 981 | openFile(fileref); |
974 | editor->setEdited(true); | 982 | editor->setEdited(true); |
975 | edited1=false; | 983 | edited1=false; |
976 | edited=true; | 984 | edited=true; |
977 | 985 | // fromSetDocument=false; | |
978 | // doSearchBar(); | 986 | // doSearchBar(); |
979 | } | 987 | } |
980 | } | 988 | } |
981 | updateCaption( currentFileName); | 989 | updateCaption( currentFileName); |
982 | } | 990 | } |
983 | 991 | ||
984 | void TextEdit::changeFont() { | 992 | void TextEdit::changeFont() { |
@@ -994,13 +1002,17 @@ void TextEdit::changeFont() { | |||
994 | editor-> setFont ( ofs-> selectedFont ( )); | 1002 | editor-> setFont ( ofs-> selectedFont ( )); |
995 | delete d; | 1003 | delete d; |
996 | 1004 | ||
997 | } | 1005 | } |
998 | 1006 | ||
999 | void TextEdit::editDelete() { | 1007 | void TextEdit::editDelete() { |
1000 | 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) ) { | 1008 | switch ( QMessageBox::warning(this,tr("Text Editor"), |
1009 | tr("Do you really want<BR>to <B>delete</B> " | ||
1010 | "the current file\nfrom the disk?<BR>This is " | ||
1011 | "<B>irreversable!!</B>"), | ||
1012 | tr("Yes"),tr("No"),0,0,1) ) { | ||
1001 | case 0: | 1013 | case 0: |
1002 | if(doc) { | 1014 | if(doc) { |
1003 | doc->removeFiles(); | 1015 | doc->removeFiles(); |
1004 | clear(); | 1016 | clear(); |
1005 | setCaption( tr("Text Editor") ); | 1017 | setCaption( tr("Text Editor") ); |
1006 | } | 1018 | } |
@@ -1016,27 +1028,30 @@ void TextEdit::changeStartConfig( bool b ) { | |||
1016 | Config cfg("TextEdit"); | 1028 | Config cfg("TextEdit"); |
1017 | cfg.setGroup("View"); | 1029 | cfg.setGroup("View"); |
1018 | cfg.writeEntry("startNew",b); | 1030 | cfg.writeEntry("startNew",b); |
1019 | update(); | 1031 | update(); |
1020 | } | 1032 | } |
1021 | 1033 | ||
1022 | void TextEdit::editorChanged() { | 1034 | void TextEdit::editorChanged() { |
1023 | if(editor->edited() && edited && !edited1) { | 1035 | // qDebug("editor changed"); |
1036 | if( /*editor->edited() &&*/ /*edited && */!edited1) { | ||
1024 | setCaption( "*"+caption()); | 1037 | setCaption( "*"+caption()); |
1025 | edited1=true; | 1038 | edited1=true; |
1026 | } | 1039 | } |
1027 | edited=true; | 1040 | edited=true; |
1028 | } | 1041 | } |
1029 | 1042 | ||
1030 | void TextEdit::receive(const QCString&msg, const QByteArray&) { | 1043 | void TextEdit::receive(const QCString&msg, const QByteArray &data) { |
1031 | qDebug("QCop "+msg); | 1044 | qDebug("QCop "+msg); |
1032 | if ( msg == "setDocument(QString)" ) { | 1045 | if ( msg == "setDocument(QString)" ) { |
1033 | qDebug("bugger all"); | 1046 | qDebug("bugger all"); |
1047 | |||
1034 | } | 1048 | } |
1035 | 1049 | ||
1036 | } | 1050 | } |
1051 | |||
1037 | void TextEdit::doAbout() { | 1052 | void TextEdit::doAbout() { |
1038 | QMessageBox::about(0,tr("Text Edit"),tr("Text Edit is copyright<BR>" | 1053 | QMessageBox::about(0,tr("Text Edit"),tr("Text Edit is copyright<BR>" |
1039 | "2000 Trolltech AS, and<BR>" | 1054 | "2000 Trolltech AS, and<BR>" |
1040 | "2002 by <B>L. J. Potter <BR>llornkcor@handhelds.org</B><BR>" | 1055 | "2002 by <B>L. J. Potter <BR>llornkcor@handhelds.org</B><BR>" |
1041 | "and is licensed under the GPL")); | 1056 | "and is licensed under the GPL")); |
1042 | } | 1057 | } |
diff --git a/core/apps/textedit/textedit.h b/core/apps/textedit/textedit.h index bb7d693..9f16ebf 100644 --- a/core/apps/textedit/textedit.h +++ b/core/apps/textedit/textedit.h | |||
@@ -113,12 +113,13 @@ private: | |||
113 | void clear(); | 113 | void clear(); |
114 | void updateCaption( const QString &name=QString::null ); | 114 | void updateCaption( const QString &name=QString::null ); |
115 | void setFontSize(int sz, bool round_down_not_up); | 115 | void setFontSize(int sz, bool round_down_not_up); |
116 | private: | 116 | private: |
117 | // fileSaver *fileSaveDlg; | 117 | // fileSaver *fileSaveDlg; |
118 | // fileBrowser *browseForFiles; | 118 | // fileBrowser *browseForFiles; |
119 | bool fromSetDocument; | ||
119 | QpeEditor* editor; | 120 | QpeEditor* editor; |
120 | QToolBar *menu, *editBar, *searchBar; | 121 | QToolBar *menu, *editBar, *searchBar; |
121 | QPopupMenu *advancedMenu; | 122 | QPopupMenu *advancedMenu; |
122 | QLineEdit *searchEdit; | 123 | QLineEdit *searchEdit; |
123 | DocLnk *doc; | 124 | DocLnk *doc; |
124 | bool fileIs, useAdvancedFeatures, promptExit, openDesktop, filePerms, useSearchBar, startWithNew; | 125 | bool fileIs, useAdvancedFeatures, promptExit, openDesktop, filePerms, useSearchBar, startWithNew; |