summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/applets/notesapplet/notes.cpp70
-rw-r--r--noncore/applets/notesapplet/notes.h3
2 files changed, 57 insertions, 16 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
@@ -83,7 +83,17 @@ NotesControl::NotesControl( QWidget *parent, const char *name )
83 : QFrame( parent, name,/* WDestructiveClose | */WStyle_StaysOnTop ) 83 : QFrame( parent, name,/* WDestructiveClose | */WStyle_StaysOnTop )
84// : QFrame( parent, name, WDestructiveClose | WStyle_StaysOnTop | WType_Popup ) 84// : QFrame( parent, name, WDestructiveClose | WStyle_StaysOnTop | WType_Popup )
85{ 85{
86 setFrameStyle( QFrame::PopupPanel | QFrame::Raised ); 86 QDir d( QDir::homeDirPath()+"/notes");
87 if( !d.exists()) {
88 qDebug("make dir");
89 if(!d.mkdir( QDir::homeDirPath()+"/notes", true))
90 qDebug("<<<<<<<<<<<<<<<<<<<<<<<<<<<make dir failed");
91 }
92 Config cfg("Notes");
93 cfg.setGroup("Options");
94 showMax = cfg.readBoolEntry("ShowMax", false);
95
96 setFrameStyle( QFrame::PopupPanel | QFrame::Raised );
87 loaded=false; 97 loaded=false;
88 edited=false; 98 edited=false;
89 doPopulate=true; 99 doPopulate=true;
@@ -105,10 +115,6 @@ NotesControl::NotesControl( QWidget *parent, const char *name )
105 vbox->addWidget( view); 115 vbox->addWidget( view);
106 vbox->addWidget( box); 116 vbox->addWidget( box);
107 117
108 setFixedHeight(180);
109 QWidget *wid = QPEApplication::desktop();
110 setFixedWidth( wid->width()-10 /*200*/);
111
112 setFocusPolicy(QWidget::StrongFocus); 118 setFocusPolicy(QWidget::StrongFocus);
113 119
114 newButton= new QPushButton( this, "newButton" ); 120 newButton= new QPushButton( this, "newButton" );
@@ -253,15 +259,15 @@ void NotesControl::slotBoxSelected(const QString &itemString) {
253 259
254void NotesControl::showMenu() { 260void NotesControl::showMenu() {
255 QPopupMenu *m = new QPopupMenu(0); 261 QPopupMenu *m = new QPopupMenu(0);
256
257 m->insertItem( tr( "Beam Out" ), this, SLOT( slotBeamButton() )); 262 m->insertItem( tr( "Beam Out" ), this, SLOT( slotBeamButton() ));
263 m->insertItem( tr( "Search For..." ), this, SLOT( slotSearch() ));
264 m->insertItem( tr( "Toggle Maximized" ), this, SLOT( slotShowMax() ));
258 m->insertSeparator(); 265 m->insertSeparator();
259 m->insertItem( tr( "Delete" ), this, SLOT( slotDeleteButton() )); 266 m->insertItem( tr( "Delete" ), this, SLOT( slotDeleteButton() ));
260 m->setFocus(); 267 m->setFocus();
261 m->exec( QCursor::pos() ); 268 m->exec( QCursor::pos() );
262 269
263 if(m) delete m; 270 if(m) delete m;
264
265} 271}
266 272
267void NotesControl::focusOutEvent ( QFocusEvent * e) { 273void NotesControl::focusOutEvent ( QFocusEvent * e) {
@@ -284,10 +290,10 @@ void NotesControl::save() {
284 QString rt = view->text(); 290 QString rt = view->text();
285 if( rt.length()>1) { 291 if( rt.length()>1) {
286 QString pt = rt.simplifyWhiteSpace(); 292 QString pt = rt.simplifyWhiteSpace();
287 int i = pt.find( ' ' ); 293 int i = pt.find( ' ', pt.find( ' ' )+2 );
288 QString docname = pt; 294 QString docname = pt;
289 if ( i > 0 ) 295 if ( i > 0 )
290 docname = pt.left( i ); 296 docname = pt.left(i);
291 // remove "." at the beginning 297 // remove "." at the beginning
292 while( docname.startsWith( "." ) ) 298 while( docname.startsWith( "." ) )
293 docname = docname.mid( 1 ); 299 docname = docname.mid( 1 );
@@ -311,15 +317,13 @@ void NotesControl::save() {
311// else 317// else
312// qDebug("oldname equals docname"); 318// qDebug("oldname equals docname");
313 319
314
315 doc = new DocLnk(docname); 320 doc = new DocLnk(docname);
316
317 if(QFile(doc->linkFile()).exists()) 321 if(QFile(doc->linkFile()).exists())
318 qDebug("puppie"); 322 qDebug("puppie");
319 doc->setType("text/plain"); 323 doc->setType("text/plain");
320 doc->setFile(QDir::homeDirPath()+"/"+docname);
321 doc->setName(docname); 324 doc->setName(docname);
322 325 QString temp = docname.replace( QRegExp(" "), "_" );
326 doc->setFile( QDir::homeDirPath()+"/notes/"+temp);
323 FileManager fm; 327 FileManager fm;
324 if ( !fm.saveFile( *doc, rt ) ) { 328 if ( !fm.saveFile( *doc, rt ) ) {
325 } 329 }
@@ -374,10 +378,16 @@ void NotesControl::load() {
374 378
375void NotesControl::load(const QString & file) { 379void NotesControl::load(const QString & file) {
376 qDebug("loading "+file); 380 qDebug("loading "+file);
377 if(!loaded) { 381 QString name = file;
382 QString temp;
383 if( !QFile( QDir::homeDirPath()+"/"+file).exists() )
384 temp = QDir::homeDirPath()+"/notes/"+ name.replace( QRegExp(" "), "_" );
385 else
386 temp = name;
387 if(!loaded) {
378 DocLnk nf; 388 DocLnk nf;
379 nf.setType("text/plain"); 389 nf.setType("text/plain");
380 nf.setFile( file); 390 nf.setFile( temp);
381 391
382 loadDoc(nf); 392 loadDoc(nf);
383 loaded=true; 393 loaded=true;
@@ -394,6 +404,7 @@ void NotesControl::loadDoc( const DocLnk &f) {
394 FileManager fm; 404 FileManager fm;
395 QString txt; 405 QString txt;
396 if ( !fm.loadFile( f, txt ) ) { 406 if ( !fm.loadFile( f, txt ) ) {
407 qDebug("could not load file "+f.file());
397 return; 408 return;
398 } 409 }
399 view->setText(txt); 410 view->setText(txt);
@@ -405,6 +416,23 @@ void NotesControl::slotViewEdited() {
405 } 416 }
406} 417}
407 418
419
420void NotesControl::slotShowMax() {
421 Config cfg("Notes");
422 cfg.setGroup("Options");
423 showMax=!showMax;
424 cfg.writeEntry("ShowMax", showMax);
425 cfg.write();
426 hide();
427}
428
429void NotesControl::slotSearch() {
430 int boxCount = box->count();
431 for(int i=0;i< boxCount;i++) {
432
433 }
434}
435
408// void NotesControl::keyReleaseEvent( QKeyEvent *e) { 436// void NotesControl::keyReleaseEvent( QKeyEvent *e) {
409 437
410// switch ( e->state() ) { 438// switch ( e->state() ) {
@@ -450,8 +478,18 @@ void NotesApplet::mousePressEvent( QMouseEvent *) {
450 } else { 478 } else {
451// vc = new NotesControl; 479// vc = new NotesControl;
452// QPoint curPos = mapToGlobal( rect().topLeft() ); 480// QPoint curPos = mapToGlobal( rect().topLeft() );
481 if(vc->showMax) {
482 qDebug("show max");
483 vc->showMaximized();
484 } else {
485 qDebug("no show max");
486 QWidget *wid = QPEApplication::desktop();
487 QRect rect = QApplication::desktop()->geometry();
488 vc->setGeometry( ( wid->width() / 2) - ( vc->width() / 2 ) , 28 , wid->width() -10 , 180);
489 vc->move ( (rect.center()/2) - (vc->rect().center()/2));
490// vc->move( (( wid->width() / 2) - ( vc->width() / 2 ))-4, 28);
491 }
453 vc->show(); 492 vc->show();
454 vc->move( 2, 28);
455 vc->doPopulate=true; 493 vc->doPopulate=true;
456 vc->populateBox(); 494 vc->populateBox();
457 vc->doPopulate=false; 495 vc->doPopulate=false;
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
@@ -42,6 +42,7 @@ public:
42 QPushButton *saveButton, *deleteButton, *newButton; 42 QPushButton *saveButton, *deleteButton, *newButton;
43 QString FileNamePath; 43 QString FileNamePath;
44 bool loaded, edited, doPopulate, isNew; 44 bool loaded, edited, doPopulate, isNew;
45 bool showMax;
45 void save(); 46 void save();
46 void populateBox(); 47 void populateBox();
47 void load(); 48 void load();
@@ -53,6 +54,8 @@ private:
53 void focusOutEvent( QFocusEvent * ); 54 void focusOutEvent( QFocusEvent * );
54 void load(const QString&); 55 void load(const QString&);
55private slots: 56private slots:
57 void slotSearch();
58 void slotShowMax();
56 void slotBeamButton(); 59 void slotBeamButton();
57 void slotBeamFinished( Ir*); 60 void slotBeamFinished( Ir*);
58 void slotDeleteButton(); 61 void slotDeleteButton();