summaryrefslogtreecommitdiff
path: root/core
authorllornkcor <llornkcor>2002-03-19 13:29:51 (UTC)
committer llornkcor <llornkcor>2002-03-19 13:29:51 (UTC)
commitf6b540e14072d9cfcd5f4a787dcd9039fae7011b (patch) (unidiff)
treed0505f71c851a7156862c0fb67c8c640f8c49205 /core
parent3ed6f60e2eb329edda0d3786c58009d06c7e5b18 (diff)
downloadopie-f6b540e14072d9cfcd5f4a787dcd9039fae7011b.zip
opie-f6b540e14072d9cfcd5f4a787dcd9039fae7011b.tar.gz
opie-f6b540e14072d9cfcd5f4a787dcd9039fae7011b.tar.bz2
searchbar was being shown when text opened from setDocument
Diffstat (limited to 'core') (more/less context) (ignore whitespace changes)
-rw-r--r--core/apps/textedit/textedit.cpp9
-rw-r--r--core/apps/textedit/textedit.h2
2 files changed, 8 insertions, 3 deletions
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp
index f56d5d3..1a1b186 100644
--- a/core/apps/textedit/textedit.cpp
+++ b/core/apps/textedit/textedit.cpp
@@ -364,25 +364,24 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
364 364
365 a = new QAction( tr( "Close Find" ), Resource::loadPixmap( "close" ), QString::null, 0, this, 0 ); 365 a = new QAction( tr( "Close Find" ), Resource::loadPixmap( "close" ), QString::null, 0, this, 0 );
366 connect( a, SIGNAL( activated() ), this, SLOT( findClose() ) ); 366 connect( a, SIGNAL( activated() ), this, SLOT( findClose() ) );
367 a->addTo( searchBar ); 367 a->addTo( searchBar );
368 368
369 edit->insertSeparator(); 369 edit->insertSeparator();
370 a = new QAction( tr( "Delete" ), Resource::loadPixmap( "close" ), QString::null, 0, this, 0 ); 370 a = new QAction( tr( "Delete" ), Resource::loadPixmap( "close" ), QString::null, 0, this, 0 );
371 connect( a, SIGNAL( activated() ), this, SLOT( editDelete() ) ); 371 connect( a, SIGNAL( activated() ), this, SLOT( editDelete() ) );
372 a->addTo( edit ); 372 a->addTo( edit );
373 373
374 searchBar->hide(); 374 searchBar->hide();
375 375
376
377 editor = new QpeEditor( this ); 376 editor = new QpeEditor( this );
378 setCentralWidget( editor ); 377 setCentralWidget( editor );
379 editor->setFrameStyle( QFrame::Panel | QFrame::Sunken ); 378 editor->setFrameStyle( QFrame::Panel | QFrame::Sunken );
380 connect( editor, SIGNAL( textChanged() ), this, SLOT( editorChanged() ) ); 379 connect( editor, SIGNAL( textChanged() ), this, SLOT( editorChanged() ) );
381 380
382 resize( 200, 300 ); 381 resize( 200, 300 );
383 382
384// setFontSize(defsize,TRUE); 383// setFontSize(defsize,TRUE);
385 FontDatabase fdb; 384 FontDatabase fdb;
386 QFont defaultFont=editor->font(); 385 QFont defaultFont=editor->font();
387 QFontInfo fontInfo(defaultFont); 386 QFontInfo fontInfo(defaultFont);
388 387
@@ -512,28 +511,33 @@ void TextEdit::fileOpen()
512 qDebug("please open "+currentFileName); 511 qDebug("please open "+currentFileName);
513 openFile(fileName ); 512 openFile(fileName );
514 } 513 }
515 } 514 }
516 viewSelection = browseForFiles->SelectionCombo->currentItem(); 515 viewSelection = browseForFiles->SelectionCombo->currentItem();
517 } 516 }
518 delete browseForFiles; 517 delete browseForFiles;
519 editor->setEdited( FALSE); 518 editor->setEdited( FALSE);
520 edited1=FALSE; 519 edited1=FALSE;
521 edited=FALSE; 520 edited=FALSE;
522 if(caption().left(1)=="*") 521 if(caption().left(1)=="*")
523 setCaption(caption().right(caption().length()-1)); 522 setCaption(caption().right(caption().length()-1));
523 doSearchBar();
524}
525
526void TextEdit::doSearchBar()
527{
524 Config cfg("TextEdit"); 528 Config cfg("TextEdit");
525 cfg.setGroup("View"); 529 cfg.setGroup("View");
526 if(cfg.readEntry("SearchBar","Closed") != "Opened") 530 if(cfg.readEntry("SearchBar","Closed") != "Opened")
527 searchBar->hide(); 531 searchBar->hide();
528} 532}
529 533
530#if 0 534#if 0
531void TextEdit::slotFind() 535void TextEdit::slotFind()
532{ 536{
533 FindDialog frmFind( "Text Editor", this ); 537 FindDialog frmFind( "Text Editor", this );
534 connect( &frmFind, SIGNAL(signalFindClicked(const QString &, bool, bool, int)), 538 connect( &frmFind, SIGNAL(signalFindClicked(const QString &, bool, bool, int)),
535 editor, SLOT(slotDoFind( const QString&,bool,bool))); 539 editor, SLOT(slotDoFind( const QString&,bool,bool)));
536 540
537 //case sensitive, backwards, [category] 541 //case sensitive, backwards, [category]
538 542
539 connect( editor, SIGNAL(notFound()), 543 connect( editor, SIGNAL(notFound()),
@@ -840,24 +844,25 @@ void TextEdit::setDocument(const QString& fileref)
840{ 844{
841 bFromDocView = TRUE; 845 bFromDocView = TRUE;
842 qDebug("setDocument "+fileref); 846 qDebug("setDocument "+fileref);
843 bFromDocView = TRUE; 847 bFromDocView = TRUE;
844 if(fileref.find(".desktop",0,TRUE) == -1) { 848 if(fileref.find(".desktop",0,TRUE) == -1) {
845 openFile(fileref); 849 openFile(fileref);
846 } else { 850 } else {
847 openFile(DocLnk(fileref)); 851 openFile(DocLnk(fileref));
848 } 852 }
849 editor->setEdited(TRUE); 853 editor->setEdited(TRUE);
850 edited1=FALSE; 854 edited1=FALSE;
851 edited=TRUE; 855 edited=TRUE;
856 doSearchBar();
852} 857}
853 858
854void TextEdit::closeEvent( QCloseEvent *e ) 859void TextEdit::closeEvent( QCloseEvent *e )
855{ 860{
856 bFromDocView = FALSE; 861 bFromDocView = FALSE;
857 e->accept(); 862 e->accept();
858} 863}
859 864
860void TextEdit::accept() 865void TextEdit::accept()
861 { 866 {
862 QString file = doc->file(); 867 QString file = doc->file();
863 if (file.find("_.txt",0,TRUE) ==-1) 868 if (file.find("_.txt",0,TRUE) ==-1)
diff --git a/core/apps/textedit/textedit.h b/core/apps/textedit/textedit.h
index a70b581..70cf068 100644
--- a/core/apps/textedit/textedit.h
+++ b/core/apps/textedit/textedit.h
@@ -52,25 +52,25 @@ class TextEdit : public QMainWindow
52public: 52public:
53 TextEdit( QWidget *parent = 0, const char *name = 0, WFlags f = 0 ); 53 TextEdit( QWidget *parent = 0, const char *name = 0, WFlags f = 0 );
54 ~TextEdit(); 54 ~TextEdit();
55 QPopupMenu *font; 55 QPopupMenu *font;
56 QAction *nStart; 56 QAction *nStart;
57 bool edited, edited1; 57 bool edited, edited1;
58 void openFile( const QString & ); 58 void openFile( const QString & );
59public slots: 59public slots:
60 void editorChanged(); 60 void editorChanged();
61 61
62protected: 62protected:
63 void closeEvent( QCloseEvent *e ); 63 void closeEvent( QCloseEvent *e );
64 64 void doSearchBar();
65private slots: 65private slots:
66 void setDocument(const QString&); 66 void setDocument(const QString&);
67 void changeFont(); 67 void changeFont();
68 void fileNew(); 68 void fileNew();
69 void fileRevert(); 69 void fileRevert();
70 void fileOpen(); 70 void fileOpen();
71 void changeStartConfig(bool); 71 void changeStartConfig(bool);
72 bool save(); 72 bool save();
73 bool saveAs(); 73 bool saveAs();
74 void cleanUp(); 74 void cleanUp();
75 75
76 76