Better version of icon

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
@@ -1,123 +1,92 @@
 /**********************************************************************
 ** Copyright (C) 2002 L.J. Potter <llornkcor@handhelds.org>
 
 **  All rights reserved.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 **********************************************************************/
 
 #include "notes.h"
 
 /* OPIE */
 #include <opie2/odebug.h>
 #include <opie2/otaskbarapplet.h>
 #include <qpe/filemanager.h>
 #include <qpe/qpeapplication.h>
 #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 */
 #include <qmultilineedit.h>
 #include <qlistbox.h>
 #include <qpopupmenu.h>
 #include <qmessagebox.h>
 #include <qapplication.h>
 #include <qdir.h>
 #include <qfile.h>
 #include <qpoint.h>
 #include <qpushbutton.h>
 #include <qpainter.h>
 #include <qlayout.h>
 #include <qframe.h>
 #include <qpixmap.h>
 #include <qstring.h>
 #include <qstringlist.h>
 #include <qtimer.h>
 
 /* 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);
 
      setFrameStyle( QFrame::PopupPanel | QFrame::Raised );
     loaded=false;
     edited=false;
     doPopulate=true;
     isNew=false;
     QVBox *vbox = new QVBox( this, "Vlayout" );
     QHBox  *hbox = new QHBox( this, "HLayout" );
 
     view = new QMultiLineEdit(vbox, "OpieNotesView");
 
     box = new QListBox(vbox, "OpieNotesBox");
 
     QPEApplication::setStylusOperation( box->viewport(),QPEApplication::RightOnHold);
 
     box->setFixedHeight(50);
 
     vbox->setMargin( 6 );
     vbox->setSpacing( 3 );
 
 
 
     setFocusPolicy(QWidget::StrongFocus);
 
     newButton= new QPushButton( hbox, "newButton" );
     newButton->setText(tr("New"));
 
 
@@ -138,95 +107,95 @@ NotesControl::NotesControl( QWidget *, const char * )
     connect( &menuTimer, SIGNAL( timeout() ), SLOT( showMenu() ) );
 
     connect(view,SIGNAL( textChanged() ), this, SLOT(slotViewEdited() ) );
 
     connect(newButton, SIGNAL(clicked()), this, SLOT(slotNewButton()));
     connect(saveButton, SIGNAL(clicked()), this, SLOT(slotSaveButton()));
     connect(deleteButton, SIGNAL(clicked()), this, SLOT(slotDeleteButtonClicked()));
 
     populateBox();
     load();
     setCaption("Notes");
       //  parent->setFocus();
 }
 
 void NotesControl::slotSaveButton() {
     slotNewButton();
     populateBox();
 }
 
 void NotesControl::slotDeleteButtonClicked() {
     switch ( QMessageBox::warning(this,tr("Delete?")
                                   ,tr("Do you really want to<BR><B> delete</B> this note ?")
                                   ,tr("Yes"),tr("No"),0,1,1) ) {
       case 0:
           slotDeleteButton();
           break;
     };
 }
 
 void NotesControl::slotDeleteButton() {
 
     QString selectedText = box->currentText();
-    odebug << "deleting "+selectedText << oendl; 
+    odebug << "deleting "+selectedText << oendl;
 
     if( !selectedText.isEmpty()) {
 
         Config cfg("Notes");
         cfg.setGroup("Docs");
         int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 );
         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 );
                 entryName.sprintf( "File%i", noOfFiles );
                 cfg.removeEntry(entryName);
                 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();
 
         populateBox();
     }
 }
 
 void NotesControl::slotNewButton() {
     if(edited) save();
     view->clear();
     view->setFocus();
     edited=false;
     isNew=false;
 }
 
 void NotesControl::slotBeamButton() {
   Ir ir;
   if(!ir.supported()){
   } else {
       this->hide();
     QString selectedText = box->currentText();
     if( !selectedText.isEmpty()) {
         QString file = QDir::homeDirPath()+"/"+selectedText;
         QFile f(file);
            Ir *irFile = new Ir(this, "IR");
           connect( irFile, SIGNAL(done(Ir*)), this, SLOT( slotBeamFinished(Ir*)));
           irFile->send( file, "Note", "text/plain" );
     }
   }
 }
@@ -256,261 +225,262 @@ void NotesControl::slotBoxSelected(const QString &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) {
-//        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 );
             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";
-//            odebug << docname << oendl; 
+//            odebug << docname << oendl;
 
             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
-//                 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);
             FileManager fm;
             if ( !fm.saveFile( *doc, rt ) ) {
             }
 
             oldDocName=docname;
             edited=false;
-//            odebug << "save" << oendl; 
+//            odebug << "save" << oendl;
             if (doPopulate)
                 populateBox();
         }
     cfg.writeEntry( "LastDoc",oldDocName );
     cfg.write();
 
     }
 }
 
 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;
     QString entryName;
     for ( int i = 0; i < noOfFiles; i++ ) {
         entryName.sprintf( "File%i", i + 1 );
         list.append(cfg.readEntry( entryName ));
     }
     list.sort();
     box->insertStringList(list,-1);
     doPopulate=false;
     update();
 }
 
 void NotesControl::load() {
 
     if(!loaded) {
         Config cfg("Notes");
         cfg.setGroup("Docs");
         QString lastDoc=cfg.readEntry( "LastDoc","notes");
         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) {
-    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(" "), "_" );
     else
         temp = name;
             if(!loaded) {
         DocLnk nf;
         nf.setType("text/plain");
         nf.setFile( temp);
         if(!temp.isEmpty())
         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 ) ) {
-        odebug << "could not load file "+f.file() << oendl; 
+        odebug << "could not load file "+f.file() << oendl;
         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
-//                   odebug << "copy" << oendl; 
+//                   odebug << "copy" << oendl;
 //     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 );
+    setFixedHeight( AppLnk::smallIconSize() );
+    setFixedWidth( AppLnk::smallIconSize() );
+    notesPixmap.convertFromImage( Resource::loadImage( "edit" ).smoothScale( height(), width() ) );
    vc = new NotesControl;
 }
 
 NotesApplet::~NotesApplet() {
     delete vc;
 }
 
 int NotesApplet::position()
 {
     return 6;
 }
 
 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) {
-             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));
 //             vc->move(  (( wid->width() / 2) - ( vc->width() / 2 ))-4, 28);
         }
         vc->show();
         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 );
+    p.drawPixmap( 0, 2, notesPixmap );
 }
 
 
 EXPORT_OPIE_APPLET_v1(  NotesApplet )