author | llornkcor <llornkcor> | 2002-03-18 01:11:48 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-03-18 01:11:48 (UTC) |
commit | 4c0bbc662731b8d3e61f43735fd6131746da306f (patch) (unidiff) | |
tree | f6b1f12bd7e1a6e73a667189bd4600c10b1ec11e | |
parent | b02657a01fc513e099c2d66be48d5a7b46cf6074 (diff) | |
download | opie-4c0bbc662731b8d3e61f43735fd6131746da306f.zip opie-4c0bbc662731b8d3e61f43735fd6131746da306f.tar.gz opie-4c0bbc662731b8d3e61f43735fd6131746da306f.tar.bz2 |
added cinocs to file
-rw-r--r-- | core/apps/textedit/fileBrowser.cpp | 28 | ||||
-rw-r--r-- | core/apps/textedit/textedit.cpp | 13 |
2 files changed, 32 insertions, 9 deletions
diff --git a/core/apps/textedit/fileBrowser.cpp b/core/apps/textedit/fileBrowser.cpp index 92c15cb..8cb7c38 100644 --- a/core/apps/textedit/fileBrowser.cpp +++ b/core/apps/textedit/fileBrowser.cpp | |||
@@ -61,34 +61,35 @@ fileBrowser::fileBrowser( QWidget* parent, const char* name, bool modal, WFlags | |||
61 | homeButton = new QPushButton( Resource::loadIconSet("home"),"",this,"homeButton"); | 61 | homeButton = new QPushButton( Resource::loadIconSet("home"),"",this,"homeButton"); |
62 | homeButton->setMinimumSize( QSize( 25, 25 ) ); | 62 | homeButton->setMinimumSize( QSize( 25, 25 ) ); |
63 | homeButton->setMaximumSize( QSize( 25, 25 ) ); | 63 | homeButton->setMaximumSize( QSize( 25, 25 ) ); |
64 | connect(homeButton,SIGNAL(released()),this,SLOT(homeButtonPushed()) ); | 64 | connect(homeButton,SIGNAL(released()),this,SLOT(homeButtonPushed()) ); |
65 | homeButton->setFlat(TRUE); | 65 | homeButton->setFlat(TRUE); |
66 | layout->addWidget( homeButton, 0, 2 ); | 66 | layout->addWidget( homeButton, 0, 2 ); |
67 | 67 | ||
68 | FileStack = new QWidgetStack( this ); | 68 | FileStack = new QWidgetStack( this ); |
69 | 69 | ||
70 | ListView = new QListView( this, "ListView" ); | 70 | ListView = new QListView( this, "ListView" ); |
71 | ListView->setMinimumSize( QSize( 100, 25 ) ); | 71 | ListView->setMinimumSize( QSize( 100, 25 ) ); |
72 | ListView->addColumn( tr( "Name" ) ); | 72 | ListView->addColumn( tr( "Name" ) ); |
73 | ListView->setColumnWidth(0,140); | 73 | ListView->setColumnWidth(0,120); |
74 | ListView->setSorting( 2, FALSE); | 74 | ListView->setSorting( 2, FALSE); |
75 | ListView->addColumn( tr( "Size" ) ); | 75 | ListView->addColumn( tr( "Size" ) ); |
76 | ListView->setColumnWidth(1,59); | 76 | ListView->setColumnWidth(1,-1); |
77 | ListView->addColumn( "Date",-1); | ||
77 | // ListView->addColumn( tr( "" ) ); | 78 | // ListView->addColumn( tr( "" ) ); |
78 | ListView->setColumnWidthMode(0,QListView::Manual); | 79 | ListView->setColumnWidthMode(0,QListView::Manual); |
79 | ListView->setColumnAlignment(1,QListView::AlignRight); | 80 | ListView->setColumnAlignment(1,QListView::AlignRight); |
80 | // ListView->setMultiSelection(true); | 81 | ListView->setColumnAlignment(2,QListView::AlignRight); |
81 | // ListView->setSelectionMode(QListView::Extended); | ||
82 | ListView->setAllColumnsShowFocus( TRUE ); | 82 | ListView->setAllColumnsShowFocus( TRUE ); |
83 | |||
83 | connect( ListView, SIGNAL(pressed( QListViewItem*)), SLOT(listClicked(QListViewItem *)) ); | 84 | connect( ListView, SIGNAL(pressed( QListViewItem*)), SLOT(listClicked(QListViewItem *)) ); |
84 | FileStack->addWidget( ListView, get_unique_id() ); | 85 | FileStack->addWidget( ListView, get_unique_id() ); |
85 | 86 | ||
86 | fileSelector = new FileSelector( "text/*", FileStack, "fileselector" , FALSE, FALSE); //buggy | 87 | fileSelector = new FileSelector( "text/*", FileStack, "fileselector" , FALSE, FALSE); //buggy |
87 | // connect( fileSelector, SIGNAL( closeMe() ), this, SLOT( showEditTools() ) ); | 88 | // connect( fileSelector, SIGNAL( closeMe() ), this, SLOT( showEditTools() ) ); |
88 | // connect( fileSelector, SIGNAL( newSelected( const DocLnk &) ), this, SLOT( newFile( const DocLnk & ) ) ); | 89 | // connect( fileSelector, SIGNAL( newSelected( const DocLnk &) ), this, SLOT( newFile( const DocLnk & ) ) ); |
89 | connect( fileSelector, SIGNAL( fileSelected( const DocLnk &) ), this, SLOT( docOpen( const DocLnk & ) ) ); | 90 | connect( fileSelector, SIGNAL( fileSelected( const DocLnk &) ), this, SLOT( docOpen( const DocLnk & ) ) ); |
90 | layout->addMultiCellWidget( FileStack, 1, 1, 0, 2 ); | 91 | layout->addMultiCellWidget( FileStack, 1, 1, 0, 2 ); |
91 | 92 | ||
92 | SelectionCombo = new QComboBox( FALSE, this, "SelectionCombo" ); | 93 | SelectionCombo = new QComboBox( FALSE, this, "SelectionCombo" ); |
93 | SelectionCombo->setMinimumSize( QSize( 200, 25 ) ); | 94 | SelectionCombo->setMinimumSize( QSize( 200, 25 ) ); |
94 | SelectionCombo->insertItem( tr( "Documents" ) ); | 95 | SelectionCombo->insertItem( tr( "Documents" ) ); |
@@ -109,56 +110,67 @@ fileBrowser::~fileBrowser() | |||
109 | { | 110 | { |
110 | } | 111 | } |
111 | 112 | ||
112 | void fileBrowser::setFileView( int selection ) | 113 | void fileBrowser::setFileView( int selection ) |
113 | { | 114 | { |
114 | SelectionCombo->setCurrentItem( selection ); | 115 | SelectionCombo->setCurrentItem( selection ); |
115 | selectionChanged( SelectionCombo->currentText() ); | 116 | selectionChanged( SelectionCombo->currentText() ); |
116 | } | 117 | } |
117 | 118 | ||
118 | void fileBrowser::populateList() | 119 | void fileBrowser::populateList() |
119 | { | 120 | { |
120 | ListView->clear(); | 121 | ListView->clear(); |
122 | bool isDir=FALSE; | ||
121 | //qDebug(currentDir.canonicalPath()); | 123 | //qDebug(currentDir.canonicalPath()); |
122 | currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst); | 124 | currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst); |
123 | currentDir.setMatchAllDirs(TRUE); | 125 | currentDir.setMatchAllDirs(TRUE); |
124 | 126 | ||
125 | currentDir.setNameFilter(filterStr); | 127 | currentDir.setNameFilter(filterStr); |
126 | // currentDir.setNameFilter("*.txt;*.etx"); | 128 | // currentDir.setNameFilter("*.txt;*.etx"); |
127 | QString fileL, fileS; | 129 | QString fileL, fileS, fileDate; |
128 | const QFileInfoList *list = currentDir.entryInfoList( /*QDir::All*/ /*, QDir::SortByMask*/); | 130 | const QFileInfoList *list = currentDir.entryInfoList( /*QDir::All*/ /*, QDir::SortByMask*/); |
129 | QFileInfoListIterator it(*list); | 131 | QFileInfoListIterator it(*list); |
130 | QFileInfo *fi; | 132 | QFileInfo *fi; |
131 | while ( (fi=it.current()) ) { | 133 | while ( (fi=it.current()) ) { |
132 | 134 | ||
133 | if (fi->isSymLink() ){ | 135 | if (fi->isSymLink() ){ |
134 | QString symLink=fi->readLink(); | 136 | QString symLink=fi->readLink(); |
135 | // qDebug("Symlink detected "+symLink); | 137 | // qDebug("Symlink detected "+symLink); |
136 | QFileInfo sym( symLink); | 138 | QFileInfo sym( symLink); |
137 | fileS.sprintf( "%10li", sym.size() ); | 139 | fileS.sprintf( "%10li", sym.size() ); |
138 | fileL.sprintf( "%s -> %s", sym.fileName().data(),sym.absFilePath().data() ); | 140 | fileL.sprintf( "%s -> %s", sym.fileName().data(),sym.absFilePath().data() ); |
139 | 141 | fileDate = sym.lastModified().toString(); | |
140 | } else { | 142 | } else { |
141 | // qDebug("Not a dir: "+currentDir.canonicalPath()+fileL); | 143 | // qDebug("Not a dir: "+currentDir.canonicalPath()+fileL); |
142 | fileS.sprintf( "%10li", fi->size() ); | 144 | fileS.sprintf( "%10li", fi->size() ); |
143 | fileL.sprintf( "%s",fi->fileName().data() ); | 145 | fileL.sprintf( "%s",fi->fileName().data() ); |
146 | fileDate= fi->lastModified().toString(); | ||
144 | if( QDir(QDir::cleanDirPath(currentDir.canonicalPath()+"/"+fileL)).exists() ) { | 147 | if( QDir(QDir::cleanDirPath(currentDir.canonicalPath()+"/"+fileL)).exists() ) { |
145 | fileL+="/"; | 148 | fileL+="/"; |
149 | isDir=TRUE; | ||
146 | // qDebug( fileL); | 150 | // qDebug( fileL); |
147 | } | 151 | } |
148 | } | 152 | } |
149 | item= new QListViewItem( ListView,fileL,fileS ); | 153 | if(fileL !="./") { |
154 | item= new QListViewItem( ListView,fileL,fileS , fileDate); | ||
155 | if(isDir || fileL.find("/",0,TRUE) != -1) | ||
156 | item->setPixmap( 0, Resource::loadPixmap( "folder" )); | ||
157 | else | ||
158 | item->setPixmap( 0, Resource::loadPixmap( "fileopen" )); | ||
159 | } | ||
160 | isDir=FALSE; | ||
150 | ++it; | 161 | ++it; |
151 | } | 162 | } |
152 | ListView->setSorting( 2, FALSE); | 163 | // ListView->setSorting( 2, FALSE); |
164 | ListView->setSorting( 3, FALSE); | ||
153 | dirLabel->setText(currentDir.canonicalPath()); | 165 | dirLabel->setText(currentDir.canonicalPath()); |
154 | } | 166 | } |
155 | 167 | ||
156 | void fileBrowser::upDir() | 168 | void fileBrowser::upDir() |
157 | { | 169 | { |
158 | // qDebug(currentDir.canonicalPath()); | 170 | // qDebug(currentDir.canonicalPath()); |
159 | } | 171 | } |
160 | 172 | ||
161 | // you may want to switch these 2 functions. I like single clicks | 173 | // you may want to switch these 2 functions. I like single clicks |
162 | void fileBrowser::listClicked(QListViewItem *selectedItem) | 174 | void fileBrowser::listClicked(QListViewItem *selectedItem) |
163 | { | 175 | { |
164 | QString strItem=selectedItem->text(0); | 176 | QString strItem=selectedItem->text(0); |
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp index 68ee1b4..d3f5fb4 100644 --- a/core/apps/textedit/textedit.cpp +++ b/core/apps/textedit/textedit.cpp | |||
@@ -347,25 +347,24 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) | |||
347 | mb->insertItem( tr( "View" ), font ); | 347 | mb->insertItem( tr( "View" ), font ); |
348 | 348 | ||
349 | searchBar = new QPEToolBar(this); | 349 | searchBar = new QPEToolBar(this); |
350 | addToolBar( searchBar, "Search", QMainWindow::Top, TRUE ); | 350 | addToolBar( searchBar, "Search", QMainWindow::Top, TRUE ); |
351 | 351 | ||
352 | searchBar->setHorizontalStretchable( TRUE ); | 352 | searchBar->setHorizontalStretchable( TRUE ); |
353 | 353 | ||
354 | searchEdit = new QLineEdit( searchBar, "searchEdit" ); | 354 | searchEdit = new QLineEdit( searchBar, "searchEdit" ); |
355 | searchBar->setStretchableWidget( searchEdit ); | 355 | searchBar->setStretchableWidget( searchEdit ); |
356 | connect( searchEdit, SIGNAL( textChanged( const QString & ) ), | 356 | connect( searchEdit, SIGNAL( textChanged( const QString & ) ), |
357 | this, SLOT( search() ) ); | 357 | this, SLOT( search() ) ); |
358 | 358 | ||
359 | |||
360 | a = new QAction( tr( "Find Next" ), Resource::loadPixmap( "next" ), QString::null, 0, this, 0 ); | 359 | a = new QAction( tr( "Find Next" ), Resource::loadPixmap( "next" ), QString::null, 0, this, 0 ); |
361 | connect( a, SIGNAL( activated() ), this, SLOT( findNext() ) ); | 360 | connect( a, SIGNAL( activated() ), this, SLOT( findNext() ) ); |
362 | a->addTo( searchBar ); | 361 | a->addTo( searchBar ); |
363 | a->addTo( edit ); | 362 | a->addTo( edit ); |
364 | 363 | ||
365 | a = new QAction( tr( "Close Find" ), Resource::loadPixmap( "close" ), QString::null, 0, this, 0 ); | 364 | a = new QAction( tr( "Close Find" ), Resource::loadPixmap( "close" ), QString::null, 0, this, 0 ); |
366 | connect( a, SIGNAL( activated() ), this, SLOT( findClose() ) ); | 365 | connect( a, SIGNAL( activated() ), this, SLOT( findClose() ) ); |
367 | a->addTo( searchBar ); | 366 | a->addTo( searchBar ); |
368 | 367 | ||
369 | edit->insertSeparator(); | 368 | edit->insertSeparator(); |
370 | a = new QAction( tr( "Delete" ), Resource::loadPixmap( "close" ), QString::null, 0, this, 0 ); | 369 | a = new QAction( tr( "Delete" ), Resource::loadPixmap( "close" ), QString::null, 0, this, 0 ); |
371 | connect( a, SIGNAL( activated() ), this, SLOT( editDelete() ) ); | 370 | connect( a, SIGNAL( activated() ), this, SLOT( editDelete() ) ); |
@@ -508,24 +507,28 @@ void TextEdit::fileOpen() | |||
508 | qDebug("please open "+currentFileName); | 507 | qDebug("please open "+currentFileName); |
509 | openFile(fileName ); | 508 | openFile(fileName ); |
510 | } | 509 | } |
511 | } | 510 | } |
512 | viewSelection = browseForFiles->SelectionCombo->currentItem(); | 511 | viewSelection = browseForFiles->SelectionCombo->currentItem(); |
513 | } | 512 | } |
514 | delete browseForFiles; | 513 | delete browseForFiles; |
515 | editor->setEdited( FALSE); | 514 | editor->setEdited( FALSE); |
516 | edited1=FALSE; | 515 | edited1=FALSE; |
517 | edited=FALSE; | 516 | edited=FALSE; |
518 | if(caption().left(1)=="*") | 517 | if(caption().left(1)=="*") |
519 | setCaption(caption().right(caption().length()-1)); | 518 | setCaption(caption().right(caption().length()-1)); |
519 | Config cfg("TextEdit"); | ||
520 | cfg.setGroup("View"); | ||
521 | if(cfg.readEntry("SearchBar","Closed") != "Opened") | ||
522 | searchBar->hide(); | ||
520 | } | 523 | } |
521 | 524 | ||
522 | #if 0 | 525 | #if 0 |
523 | void TextEdit::slotFind() | 526 | void TextEdit::slotFind() |
524 | { | 527 | { |
525 | FindDialog frmFind( "Text Editor", this ); | 528 | FindDialog frmFind( "Text Editor", this ); |
526 | connect( &frmFind, SIGNAL(signalFindClicked(const QString &, bool, bool, int)), | 529 | connect( &frmFind, SIGNAL(signalFindClicked(const QString &, bool, bool, int)), |
527 | editor, SLOT(slotDoFind( const QString&,bool,bool))); | 530 | editor, SLOT(slotDoFind( const QString&,bool,bool))); |
528 | 531 | ||
529 | //case sensitive, backwards, [category] | 532 | //case sensitive, backwards, [category] |
530 | 533 | ||
531 | connect( editor, SIGNAL(notFound()), | 534 | connect( editor, SIGNAL(notFound()), |
@@ -562,36 +565,44 @@ void TextEdit::editCopy() | |||
562 | void TextEdit::editPaste() | 565 | void TextEdit::editPaste() |
563 | { | 566 | { |
564 | #ifndef QT_NO_CLIPBOARD | 567 | #ifndef QT_NO_CLIPBOARD |
565 | editor->paste(); | 568 | editor->paste(); |
566 | #endif | 569 | #endif |
567 | } | 570 | } |
568 | 571 | ||
569 | void TextEdit::editFind() | 572 | void TextEdit::editFind() |
570 | { | 573 | { |
571 | searchBar->show(); | 574 | searchBar->show(); |
572 | searchVisible = TRUE; | 575 | searchVisible = TRUE; |
573 | searchEdit->setFocus(); | 576 | searchEdit->setFocus(); |
577 | Config cfg("TextEdit"); | ||
578 | cfg.setGroup("View"); | ||
579 | cfg.writeEntry("SearchBar","Opened"); | ||
580 | |||
574 | } | 581 | } |
575 | 582 | ||
576 | void TextEdit::findNext() | 583 | void TextEdit::findNext() |
577 | { | 584 | { |
578 | editor->find( searchEdit->text(), FALSE, FALSE ); | 585 | editor->find( searchEdit->text(), FALSE, FALSE ); |
579 | 586 | ||
580 | } | 587 | } |
581 | 588 | ||
582 | void TextEdit::findClose() | 589 | void TextEdit::findClose() |
583 | { | 590 | { |
584 | searchVisible = FALSE; | 591 | searchVisible = FALSE; |
585 | searchBar->hide(); | 592 | searchBar->hide(); |
593 | Config cfg("TextEdit"); | ||
594 | cfg.setGroup("View"); | ||
595 | cfg.writeEntry("SearchBar","Closed"); | ||
596 | cfg.write(); | ||
586 | } | 597 | } |
587 | 598 | ||
588 | void TextEdit::search() | 599 | void TextEdit::search() |
589 | { | 600 | { |
590 | editor->find( searchEdit->text(), FALSE, FALSE ); | 601 | editor->find( searchEdit->text(), FALSE, FALSE ); |
591 | } | 602 | } |
592 | 603 | ||
593 | void TextEdit::newFile( const DocLnk &f ) | 604 | void TextEdit::newFile( const DocLnk &f ) |
594 | { | 605 | { |
595 | DocLnk nf = f; | 606 | DocLnk nf = f; |
596 | nf.setType("text/plain"); | 607 | nf.setType("text/plain"); |
597 | clear(); | 608 | clear(); |