author | llornkcor <llornkcor> | 2002-11-21 00:54:20 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-11-21 00:54:20 (UTC) |
commit | a65963a06def8cb064bf7d99ff2776877f5f6315 (patch) (side-by-side diff) | |
tree | 1134ef93e2ee628b4bcff73b0d0965266439d073 | |
parent | 9cef034e112118ad388b0678cd492d81b1695021 (diff) | |
download | opie-a65963a06def8cb064bf7d99ff2776877f5f6315.zip opie-a65963a06def8cb064bf7d99ff2776877f5f6315.tar.gz opie-a65963a06def8cb064bf7d99ff2776877f5f6315.tar.bz2 |
changed title, added maximixed mode. save to /notes
-rw-r--r-- | noncore/applets/notesapplet/notes.cpp | 64 | ||||
-rw-r--r-- | noncore/applets/notesapplet/notes.h | 3 |
2 files changed, 54 insertions, 13 deletions
diff --git a/noncore/applets/notesapplet/notes.cpp b/noncore/applets/notesapplet/notes.cpp index 90c2550..2b25476 100644 --- a/noncore/applets/notesapplet/notes.cpp +++ b/noncore/applets/notesapplet/notes.cpp @@ -62,74 +62,80 @@ static char * notes_xpm[] = { "= c #0005BF", "- c #7F0000", " .. ", " .. ", " ... ", " .+ ", " .@. ", " . .+ ", " ..#.@. ", " ..###.+.. ", " ..###$...##.. ", "..###$$$%+$$##&.", ".*=####$-###&=&.", ".=**=###==&=&=..", " ..=**=#&=&=.. ", " ..=*=&=.. ", " ..=.. ", " . "}; NotesControl::NotesControl( QWidget *parent, const char *name ) : QFrame( parent, name,/* WDestructiveClose | */WStyle_StaysOnTop ) // : QFrame( parent, name, WDestructiveClose | WStyle_StaysOnTop | WType_Popup ) { + QDir d( QDir::homeDirPath()+"/notes"); + if( !d.exists()) { + qDebug("make dir"); + if(!d.mkdir( QDir::homeDirPath()+"/notes", true)) + qDebug("<<<<<<<<<<<<<<<<<<<<<<<<<<<make dir failed"); + } + Config cfg("Notes"); + cfg.setGroup("Options"); + showMax = cfg.readBoolEntry("ShowMax", false); + setFrameStyle( QFrame::PopupPanel | QFrame::Raised ); loaded=false; edited=false; doPopulate=true; isNew=false; QVBoxLayout *vbox = new QVBoxLayout( this,0, -1, "Vlayout" ); QHBoxLayout *hbox = new QHBoxLayout( this, 0, -1, "HLayout" ); view = new QMultiLineEdit(this, "OpieNotesView"); box = new QListBox(this, "OpieNotesBox"); QPEApplication::setStylusOperation( box->viewport(),QPEApplication::RightOnHold); box->setFixedHeight(50); vbox->setMargin( 6 ); vbox->setSpacing( 3 ); vbox->addWidget( view); vbox->addWidget( box); - setFixedHeight(180); - QWidget *wid = QPEApplication::desktop(); - setFixedWidth( wid->width()-10 /*200*/); - setFocusPolicy(QWidget::StrongFocus); newButton= new QPushButton( this, "newButton" ); newButton->setText(tr("New")); hbox->addWidget( newButton); saveButton= new QPushButton( this, "saveButton" ); saveButton->setText(tr("Save")); hbox->addWidget( saveButton); deleteButton= new QPushButton( this, "deleteButton" ); deleteButton->setText(tr("Delete")); hbox->addWidget( deleteButton); vbox->addItem(hbox); connect( box, SIGNAL( mouseButtonPressed( int, QListBoxItem *, const QPoint&)), this,SLOT( boxPressed(int, QListBoxItem *, const QPoint&)) ); connect(box, SIGNAL(highlighted(const QString&)), this, SLOT(slotBoxSelected(const QString &))); connect( &menuTimer, SIGNAL( timeout() ), SLOT( showMenu() ) ); connect(view,SIGNAL( textChanged() ), this, SLOT(slotViewEdited() ) ); @@ -232,115 +238,113 @@ void NotesControl::slotBeamFinished(Ir *) { void NotesControl::boxPressed(int mouse, QListBoxItem *, const QPoint&) { switch (mouse) { case 1:{ } break; case 2: menuTimer.start( 500, TRUE ); break; }; } void NotesControl::slotBoxSelected(const QString &itemString) { if(edited) { save(); } loaded=false; edited=false; load(itemString); } void NotesControl::showMenu() { QPopupMenu *m = new QPopupMenu(0); - m->insertItem( tr( "Beam Out" ), this, SLOT( slotBeamButton() )); + m->insertItem( tr( "Search For..." ), this, SLOT( slotSearch() )); + m->insertItem( tr( "Toggle Maximized" ), this, SLOT( slotShowMax() )); m->insertSeparator(); m->insertItem( tr( "Delete" ), this, SLOT( slotDeleteButton() )); m->setFocus(); m->exec( QCursor::pos() ); if(m) delete m; - } void NotesControl::focusOutEvent ( QFocusEvent * e) { if( e->reason() == QFocusEvent::Popup) save(); else { if(!loaded) { populateBox(); load(); } } QWidget::focusOutEvent(e); } void NotesControl::save() { Config cfg("Notes"); cfg.setGroup("Docs"); if( edited) { // qDebug("is edited"); QString rt = view->text(); if( rt.length()>1) { QString pt = rt.simplifyWhiteSpace(); - int i = pt.find( ' ' ); + int i = pt.find( ' ', pt.find( ' ' )+2 ); QString docname = pt; if ( i > 0 ) docname = pt.left( i ); // remove "." at the beginning while( docname.startsWith( "." ) ) docname = docname.mid( 1 ); docname.replace( QRegExp("/"), "_" ); // cut the length. filenames longer than that don't make sense // and something goes wrong when they get too long. if ( docname.length() > 40 ) docname = docname.left(40); if ( docname.isEmpty() ) docname = "Empty Text"; // qDebug(docname); if( oldDocName != docname) { int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 ); QString entryName; entryName.sprintf( "File%i", noOfFiles + 1 ); cfg.writeEntry( entryName,docname ); cfg.writeEntry("NumberOfFiles", noOfFiles+1 ); cfg.write(); } // else // qDebug("oldname equals docname"); - doc = new DocLnk(docname); - if(QFile(doc->linkFile()).exists()) qDebug("puppie"); doc->setType("text/plain"); - doc->setFile(QDir::homeDirPath()+"/"+docname); doc->setName(docname); - + QString temp = docname.replace( QRegExp(" "), "_" ); + doc->setFile( QDir::homeDirPath()+"/notes/"+temp); FileManager fm; if ( !fm.saveFile( *doc, rt ) ) { } oldDocName=docname; edited=false; // qDebug("save"); if (doPopulate) populateBox(); } cfg.writeEntry( "LastDoc",oldDocName ); cfg.write(); } } void NotesControl::populateBox() { box->clear(); // qDebug("populate"); Config cfg("Notes"); cfg.setGroup("Docs"); int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 ); QStringList list; QString entryName; @@ -353,118 +357,152 @@ void NotesControl::populateBox() { doPopulate=false; update(); } void NotesControl::load() { if(!loaded) { Config cfg("Notes"); cfg.setGroup("Docs"); QString lastDoc=cfg.readEntry( "LastDoc",""); DocLnk nf; nf.setType("text/plain"); nf.setFile(lastDoc); loadDoc(nf); loaded=true; oldDocName=lastDoc; cfg.writeEntry( "LastDoc",oldDocName ); cfg.write(); } } void NotesControl::load(const QString & file) { qDebug("loading "+file); + QString name = file; + QString temp; + if( !QFile( QDir::homeDirPath()+"/"+file).exists() ) + temp = QDir::homeDirPath()+"/notes/"+ name.replace( QRegExp(" "), "_" ); + else + temp = name; if(!loaded) { DocLnk nf; nf.setType("text/plain"); - nf.setFile( file); + nf.setFile( temp); loadDoc(nf); loaded=true; } // view->setFocus(); oldDocName=file; Config cfg("Notes"); cfg.setGroup("Docs"); cfg.writeEntry( "LastDoc",oldDocName ); cfg.write(); } void NotesControl::loadDoc( const DocLnk &f) { FileManager fm; QString txt; if ( !fm.loadFile( f, txt ) ) { + qDebug("could not load file "+f.file()); return; } view->setText(txt); } void NotesControl::slotViewEdited() { if(loaded) { edited=true; } } + +void NotesControl::slotShowMax() { + Config cfg("Notes"); + cfg.setGroup("Options"); + showMax=!showMax; + cfg.writeEntry("ShowMax", showMax); + cfg.write(); + hide(); +} + +void NotesControl::slotSearch() { + int boxCount = box->count(); + for(int i=0;i< boxCount;i++) { + + } +} + // void NotesControl::keyReleaseEvent( QKeyEvent *e) { // switch ( e->state() ) { // case ControlButton: // if(e->key() == Key_C) { //copy // qDebug("copy"); // QClipboard *cb = QApplication::clipboard(); // QString text; // // Copy text from the clipboard (paste) // text = cb->text(); // } // if(e->key() == Key_X) { //cut // } // if(e->key() == Key_V) { //paste // QClipboard *cb = QApplication::clipboard(); // QString text; // //view // cb->setText(); // } // break; // }; // QWidget::keyReleaseEvent(e); // } //=========================================================================== NotesApplet::NotesApplet( QWidget *parent, const char *name ) : QWidget( parent, name ) { setFixedHeight( 18 ); setFixedWidth( 14 ); vc = new NotesControl; } NotesApplet::~NotesApplet() { } void NotesApplet::mousePressEvent( QMouseEvent *) { if( !vc->isHidden()) { vc->doPopulate=false; vc->save(); vc->close(); } else { // vc = new NotesControl; // QPoint curPos = mapToGlobal( rect().topLeft() ); + if(vc->showMax) { + qDebug("show max"); + vc->showMaximized(); + } else { + qDebug("no show max"); + QWidget *wid = QPEApplication::desktop(); + QRect rect = QApplication::desktop()->geometry(); + vc->setGeometry( ( wid->width() / 2) - ( vc->width() / 2 ) , 28 , wid->width() -10 , 180); + vc->move ( (rect.center()/2) - (vc->rect().center()/2)); +// vc->move( (( wid->width() / 2) - ( vc->width() / 2 ))-4, 28); + } vc->show(); - vc->move( 2, 28); vc->doPopulate=true; vc->populateBox(); vc->doPopulate=false; vc->loaded=false; vc->load(); // this->setFocus(); vc->view->setFocus(); } } void NotesApplet::paintEvent( QPaintEvent* ) { QPainter p(this); p.drawPixmap( 0, 1, ( const char** ) notes_xpm ); } diff --git a/noncore/applets/notesapplet/notes.h b/noncore/applets/notesapplet/notes.h index 381dc80..c428efe 100644 --- a/noncore/applets/notesapplet/notes.h +++ b/noncore/applets/notesapplet/notes.h @@ -21,59 +21,62 @@ #include <qguardedptr.h> #include <qtimer.h> #include <qpe/filemanager.h> #include <qpe/ir.h> #include <qstring.h> class QComboBox; class QCheckBox; class QSpinBox; class QPushButton; class QMultiLineEdit; class QListBox; class QListBoxItem; class NotesControl : public QFrame { Q_OBJECT public: NotesControl( QWidget *parent=0, const char *name=0 ); QPixmap notes; QMultiLineEdit *view; QListBox *box; QPushButton *saveButton, *deleteButton, *newButton; QString FileNamePath; bool loaded, edited, doPopulate, isNew; + bool showMax; void save(); void populateBox(); void load(); private: QTimer menuTimer; DocLnk *doc; QString oldDocName; void focusOutEvent( QFocusEvent * ); void load(const QString&); private slots: + void slotSearch(); + void slotShowMax(); void slotBeamButton(); void slotBeamFinished( Ir*); void slotDeleteButton(); void slotSaveButton(); void slotDeleteButtonClicked(); void slotNewButton(); void boxPressed(int, QListBoxItem *, const QPoint&); void showMenu(); void loadDoc( const DocLnk &); void slotViewEdited(); void slotBoxSelected(const QString &); // void keyReleaseEvent( QKeyEvent *); }; class NotesApplet : public QWidget { Q_OBJECT public: NotesApplet( QWidget *parent = 0, const char *name=0 ); ~NotesApplet(); NotesControl *vc; public slots: private: void mousePressEvent( QMouseEvent * ); |