| -rw-r--r-- | noncore/applets/notesapplet/notes.cpp | 76 |
1 files changed, 23 insertions, 53 deletions
diff --git a/noncore/applets/notesapplet/notes.cpp b/noncore/applets/notesapplet/notes.cpp index b3e72a7..d06672a 100644 --- a/noncore/applets/notesapplet/notes.cpp +++ b/noncore/applets/notesapplet/notes.cpp @@ -23,8 +23,9 @@ #include <qpe/timestring.h> #include <qpe/applnk.h> #include <qpe/ir.h> #include <qpe/config.h> +#include <qpe/resource.h> using namespace Opie::Core; using namespace Opie::Ui; /* QT */ @@ -47,49 +48,17 @@ using namespace Opie::Ui; /* STD */ #include <stdlib.h> -/* XPM */ -static char * notes_xpm[] = { -"16 16 11 1", -" c None", -". c #000000", -"+ c #7F7F7F", -"@ c #BFBFBF", -"# c #BFC1FF", -"$ c #FF0000", -"% c #FFFFFF", -"& c #00037F", -"* c #0006FF", -"= c #0005BF", -"- c #7F0000", -" .. ", -" .. ", -" ... ", -" .+ ", -" .@. ", -" . .+ ", -" ..#.@. ", -" ..###.+.. ", -" ..###$...##.. ", -"..###$$$%+$$##&.", -".*=####$-###&=&.", -".=**=###==&=&=..", -" ..=**=#&=&=.. ", -" ..=*=&=.. ", -" ..=.. ", -" . "}; - - NotesControl::NotesControl( QWidget *, const char * ) : QVBox( 0, "NotesControl",/* WDestructiveClose | */WStyle_StaysOnTop ) // : QFrame( parent, name, WDestructiveClose | WStyle_StaysOnTop | WType_Popup ) { QDir d( QDir::homeDirPath()+"/notes"); if( !d.exists()) { - odebug << "make dir" << oendl; + odebug << "make dir" << oendl; if(!d.mkdir( QDir::homeDirPath()+"/notes", true)) - odebug << "<<<<<<<<<<<<<<<<<<<<<<<<<<<make dir failed" << oendl; + odebug << "<<<<<<<<<<<<<<<<<<<<<<<<<<<make dir failed" << oendl; } Config cfg("Notes"); cfg.setGroup("Options"); showMax = cfg.readBoolEntry("ShowMax", false); @@ -166,9 +135,9 @@ void NotesControl::slotDeleteButtonClicked() { void NotesControl::slotDeleteButton() { QString selectedText = box->currentText(); - odebug << "deleting "+selectedText << oendl; + odebug << "deleting "+selectedText << oendl; if( !selectedText.isEmpty()) { Config cfg("Notes"); @@ -177,14 +146,14 @@ void NotesControl::slotDeleteButton() { QString entryName, entryName2;; for ( int i = 0; i < noOfFiles; i++ ) { entryName.sprintf( "File%i", i + 1 ); if(selectedText == cfg.readEntry( entryName )) { - odebug << "removing " << selectedText.latin1() << ", " << i << "" << oendl; + odebug << "removing " << selectedText.latin1() << ", " << i << "" << oendl; for ( int j = i; j < noOfFiles; j++ ) { entryName.sprintf( "File%i", i + 1 ); entryName2.sprintf( "File%i", i + 2 ); QString temp = cfg.readEntry(entryName2); - odebug << "move "+temp << oendl; + odebug << "move "+temp << oendl; cfg.writeEntry(entryName, temp); i++; } cfg.writeEntry("NumberOfFiles", noOfFiles-1 ); @@ -193,12 +162,12 @@ void NotesControl::slotDeleteButton() { cfg.write(); DocLnk nf(selectedText); nf.removeFiles(); QString fi=QPEApplication::documentDir()+"/text/plain/"+selectedText+".desktop"; - odebug << fi << oendl; + odebug << fi << oendl; QFile f( fi); - if( !f.remove()) odebug << ".desktop file not removed" << oendl; + if( !f.remove()) odebug << ".desktop file not removed" << oendl; } } view->clear(); @@ -284,9 +253,9 @@ void NotesControl::focusOutEvent ( QFocusEvent * e) { void NotesControl::save() { Config cfg("Notes"); cfg.setGroup("Docs"); if( edited) { -// odebug << "is edited" << oendl; +// odebug << "is edited" << oendl; QString rt = view->text(); if( rt.length()>1) { QString pt = rt.simplifyWhiteSpace(); int i = pt.find( ' ', pt.find( ' ' )+2 ); @@ -302,9 +271,9 @@ void NotesControl::save() { if ( docname.length() > 40 ) docname = docname.left(40); if ( docname.isEmpty() ) docname = "Empty Text"; -// odebug << docname << oendl; +// odebug << docname << oendl; if( oldDocName != docname) { int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 ); QString entryName; @@ -313,13 +282,13 @@ void NotesControl::save() { cfg.writeEntry("NumberOfFiles", noOfFiles+1 ); cfg.write(); } // else -// odebug << "oldname equals docname" << oendl; +// odebug << "oldname equals docname" << oendl; doc = new DocLnk(docname); if(QFile(doc->linkFile()).exists()) - odebug << "puppie" << oendl; + odebug << "puppie" << oendl; doc->setType("text/plain"); doc->setName(docname); QString temp = docname.replace( QRegExp(" "), "_" ); doc->setFile( QDir::homeDirPath()+"/notes/"+temp); @@ -328,9 +297,9 @@ void NotesControl::save() { } oldDocName=docname; edited=false; -// odebug << "save" << oendl; +// odebug << "save" << oendl; if (doPopulate) populateBox(); } cfg.writeEntry( "LastDoc",oldDocName ); @@ -340,9 +309,9 @@ void NotesControl::save() { } void NotesControl::populateBox() { box->clear(); -// odebug << "populate" << oendl; +// odebug << "populate" << oendl; Config cfg("Notes"); cfg.setGroup("Docs"); int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 ); QStringList list; @@ -375,9 +344,9 @@ void NotesControl::load() { } } void NotesControl::load(const QString & file) { - odebug << "loading "+file << oendl; + odebug << "loading "+file << oendl; QString name = file; QString temp; if( !QFile( QDir::homeDirPath()+"/"+file).exists() ) temp = QDir::homeDirPath()+"/notes/"+ name.replace( QRegExp(" "), "_" ); @@ -402,9 +371,9 @@ void NotesControl::load(const QString & file) { void NotesControl::loadDoc( const DocLnk &f) { FileManager fm; QString txt; if ( !fm.loadFile( f, txt ) ) { - odebug << "could not load file "+f.file() << oendl; + odebug << "could not load file "+f.file() << oendl; return; } view->setText(txt); } @@ -436,9 +405,9 @@ void NotesControl::slotSearch() { // switch ( e->state() ) { // case ControlButton: // if(e->key() == Key_C) { //copy -// odebug << "copy" << oendl; +// odebug << "copy" << oendl; // QClipboard *cb = QApplication::clipboard(); // QString text; // // Copy text from the clipboard (paste) @@ -460,10 +429,11 @@ void NotesControl::slotSearch() { //=========================================================================== NotesApplet::NotesApplet( QWidget *parent, const char *name ) : QWidget( parent, name ) { - setFixedHeight( 18 ); - setFixedWidth( 14 ); + setFixedHeight( AppLnk::smallIconSize() ); + setFixedWidth( AppLnk::smallIconSize() ); + notesPixmap.convertFromImage( Resource::loadImage( "edit" ).smoothScale( height(), width() ) ); vc = new NotesControl; } NotesApplet::~NotesApplet() { @@ -483,12 +453,12 @@ void NotesApplet::mousePressEvent( QMouseEvent *) { } else { // vc = new NotesControl; // QPoint curPos = mapToGlobal( rect().topLeft() ); if(vc->showMax) { - odebug << "show max" << oendl; + odebug << "show max" << oendl; vc->showMaximized(); } else { - odebug << "no show max" << oendl; + odebug << "no show max" << oendl; 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)); @@ -507,9 +477,9 @@ void NotesApplet::mousePressEvent( QMouseEvent *) { } void NotesApplet::paintEvent( QPaintEvent* ) { QPainter p(this); - p.drawPixmap( 0, 1, ( const char** ) notes_xpm ); + p.drawPixmap( 0, 2, notesPixmap ); } EXPORT_OPIE_APPLET_v1( NotesApplet ) |