Resource -> OResource

1 files changed, 51 insertions, 18 deletions

diff --git a/noncore/apps/opie-sheet/mainwindow.cpp b/noncore/apps/opie-sheet/mainwindow.cpp
index 3095142..4938ea8 100644
--- a/noncore/apps/opie-sheet/mainwindow.cpp
+++ b/noncore/apps/opie-sheet/mainwindow.cpp
@@ -1,133 +1,133 @@
 /*
                =.            This file is part of the Opie Project
              .=l.            Copyright (C) 2004 Opie Developer Team <opie-devel@handhelds.org>
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 /*
  * Opie Sheet (formerly Sheet/Qt)
  * by Serdar Ozler <sozler@sitebest.com>
  */
 
 #include "mainwindow.h"
 
 /* OPIE */
-#include <qpe/resource.h>
+#include <opie2/oresource.h>
 #include <qpe/qpeapplication.h>
 
 /* QT */
 #include <qmessagebox.h>
 #include <qradiobutton.h>
 
 /* STD */
 #include "cellformat.h"
 #include "numberdlg.h"
 #include "textdlg.h"
 #include "sortdlg.h"
 #include "finddlg.h"
 
 #define DEFAULT_NUM_ROWS 300
 #define DEFAULT_NUM_COLS (26*3)
 #define DEFAULT_NUM_SHEETS 3
 
 MainWindow::MainWindow(QWidget *parent, const char* n, WFlags fl)
         :QMainWindow(parent, n, fl)
 {
     // initialize variables
     documentModified=FALSE;
 
     // construct objects
     currentDoc=0;
     fileSelector=new FileSelector("application/opie-sheet", this, QString::null);
     ExcelSelector=new FileSelector("application/excel",this,QString::null,FALSE);
     connect(fileSelector, SIGNAL(closeMe()), this, SLOT(selectorHide()));
     connect(fileSelector, SIGNAL(newSelected(const DocLnk&)), this, SLOT(selectorFileNew(const DocLnk&)));
     connect(fileSelector, SIGNAL(fileSelected(const DocLnk&)), this, SLOT(selectorFileOpen(const DocLnk&)));
     connect(ExcelSelector,SIGNAL(fileSelected(const DocLnk&)),this,SLOT(slotImportExcel(const DocLnk&)));
     connect(ExcelSelector,SIGNAL(closeMe()), this, SLOT(ExcelSelectorHide()));
 
     listSheets.setAutoDelete(TRUE);
 
     initActions();
     initMenu();
     initEditToolbar();
     initFunctionsToolbar();
     initStandardToolbar();
     initSheet();
 
     // set window title
     setCaption(tr("Opie Sheet"));
 
     // create sheets
     selectorFileNew(DocLnk());
 }
 
 MainWindow::~MainWindow()
 {
     if (currentDoc) delete currentDoc;
 }
 
 void MainWindow::documentSave(DocLnk *lnkDoc)
 {
     FileManager fm;
     QByteArray streamBuffer;
     QDataStream stream(streamBuffer, IO_WriteOnly);
 
     typeSheet *currentSheet=findSheet(sheet->getName());
     if (!currentSheet)
     {
         QMessageBox::critical(this, tr("Error"), tr("Inconsistency error!"));
         return;
     }
     sheet->copySheetData(&currentSheet->data);
     stream.writeRawBytes("SQT100", 6);
     stream << (Q_UINT32)listSheets.count();
     for (typeSheet *tempSheet=listSheets.first(); tempSheet; tempSheet=listSheets.next())
     {
         stream << tempSheet->name << (Q_UINT32)tempSheet->data.count();
         for (typeCellData *tempCell=tempSheet->data.first(); tempCell; tempCell=tempSheet->data.next())
             stream << (Q_UINT32)tempCell->col << (Q_UINT32)tempCell->row << tempCell->borders.right << tempCell->borders.bottom << tempCell->background << (Q_UINT32)tempCell->alignment << tempCell->fontColor << tempCell->font << tempCell->data;
     }
 
     lnkDoc->setType("application/opie-sheet");
     if (!fm.saveFile(*lnkDoc, streamBuffer))
     {
         QMessageBox::critical(this, tr("Error"), tr("File cannot be saved!"));
         return;
     }
     documentModified=FALSE;
 }
 
 void MainWindow::documentOpen(const DocLnk &lnkDoc)
 {
     FileManager fm;
     QByteArray streamBuffer;
     if (!lnkDoc.isValid() || !fm.loadFile(lnkDoc, streamBuffer))
     {
         QMessageBox::critical(this, tr("Error"), tr("File cannot be opened!"));
         documentModified=FALSE;
         selectorFileNew(DocLnk());
         return;
     }
@@ -196,288 +196,320 @@ int MainWindow::saveCurrentFile(bool ask)
     documentSave(currentDoc);
     return QMessageBox::Yes;
 }
 
 void MainWindow::selectorFileNew(const DocLnk &lnkDoc)
 {
     selectorHide();
 
     if (documentModified && saveCurrentFile()==QMessageBox::Cancel) return;
     if (currentDoc) delete currentDoc;
     currentDoc = new DocLnk(lnkDoc);
     editData->clear();
     listSheets.clear();
     comboSheets->clear();
 
     typeSheet *newSheet=createNewSheet();
     newSheet->data.setAutoDelete(TRUE);
     sheet->setName(newSheet->name);
     sheet->setSheetData(&newSheet->data);
     for (int i=1; i<DEFAULT_NUM_SHEETS; ++i)
         createNewSheet();
     documentModified=FALSE;
 }
 
 void MainWindow::closeEvent(QCloseEvent *e)
 {
     if (documentModified && saveCurrentFile()==QMessageBox::Cancel) e->ignore();
     else e->accept();
 }
 
 void MainWindow::selectorFileOpen(const DocLnk &lnkDoc)
 {
     selectorHide();
 
     if (documentModified && saveCurrentFile()==QMessageBox::Cancel) return;
     if (currentDoc) delete currentDoc;
     currentDoc = new DocLnk( lnkDoc );
     listSheets.clear();
     comboSheets->clear();
 
     documentOpen(lnkDoc);
     documentModified=FALSE;
 }
 
 void MainWindow::selectorShow()
 {
     sheet->hide();
     setCentralWidget(fileSelector);
     fileSelector->show();
     fileSelector->reread();
 }
 
 void MainWindow::selectorHide()
 {
     fileSelector->hide();
     setCentralWidget(sheet);
     sheet->show();
 }
 
 void MainWindow::slotFileNew()
 {
     selectorFileNew(DocLnk());
 }
 
 void MainWindow::slotFileOpen()
 {
     selectorShow();
 }
 
 void MainWindow::slotImportExcelOpen()
 {
     sheet->hide();
     setCentralWidget(ExcelSelector);
     ExcelSelector->show();
     ExcelSelector->reread();
 }
 
 void MainWindow::ExcelSelectorHide()
 {
     ExcelSelector->hide();
     setCentralWidget(sheet);
     sheet->show();
 }
 
 void MainWindow::slotFileSave()
 {
     saveCurrentFile(FALSE);
 }
 
 void MainWindow::setDocument(const QString &applnk_filename)
 {
     selectorFileOpen(DocLnk(applnk_filename));
 }
 
 void MainWindow::initActions()
 {
-    fileNew=new QAction(tr("New File"), Resource::loadPixmap( "new" ), tr("&New"), 0, this);
+    fileNew=new QAction(tr("New File"),
+                        Opie::Core::OResource::loadPixmap( "new", Opie::Core::OResource::SmallIcon ),
+                        tr("&New"), 0, this);
     connect(fileNew, SIGNAL(activated()), this, SLOT(slotFileNew()));
-    fileOpen=new QAction(tr("Open File"), Resource::loadPixmap( "fileopen" ), tr("&Open"), 0, this);
+    fileOpen=new QAction(tr("Open File"),
+                         Opie::Core::OResource::loadPixmap( "fileopen", Opie::Core::OResource::SmallIcon ),
+                         tr("&Open"), 0, this);
     connect(fileOpen, SIGNAL(activated()), this, SLOT(slotFileOpen()));
-    fileSave=new QAction(tr("Save File"),Resource::loadPixmap( "save" ), tr("&Save"), 0, this);
+    fileSave=new QAction(tr("Save File"),
+                         Opie::Core::OResource::loadPixmap( "save", Opie::Core::OResource::SmallIcon ),
+                         tr("&Save"), 0, this);
     connect(fileSave, SIGNAL(activated()), this, SLOT(slotFileSave()));
-    fileSaveAs=new QAction(tr("Save File As"), Resource::loadPixmap( "save" ), tr("Save &As"), 0, this);
+    fileSaveAs=new QAction(tr("Save File As"),
+                           Opie::Core::OResource::loadPixmap( "save", Opie::Core::OResource::SmallIcon ),
+                           tr("Save &As"), 0, this);
     connect(fileSaveAs, SIGNAL(activated()), this, SLOT(slotFileSaveAs()));
 
     //fileQuit=new QAction(tr("Quit"), tr("&Quit"), 0, this);
     //connect(fileQuit, SIGNAL(activated()), this, SLOT(close()));
-    fileExcelImport=new QAction(tr("Import Excel file"),Resource::loadPixmap( "opie-sheet/excel16" ),tr("Import E&xcel file"),0,this);
+    fileExcelImport=new QAction(tr("Import Excel file"),
+                                Opie::Core::OResource::loadPixmap( "opie-sheet/excel16", Opie::Core::OResource::SmallIcon ),
+                                tr("Import E&xcel file"),0,this);
     connect(fileExcelImport, SIGNAL(activated()), this, SLOT(slotImportExcelOpen()));
 
     // helpGeneral=new QAction(tr("General Help"), QPixmap(help_general_xpm), tr("&General"), 0, this);
     //connect(helpGeneral, SIGNAL(activated()), this, SLOT(slotHelpGeneral()));
     //helpAbout=new QAction(tr("About Opie Sheet"), tr("&About"), 0, this);
     //connect(helpAbout, SIGNAL(activated()), this, SLOT(slotHelpAbout()));
 
-    editAccept=new QAction(tr("Accept"),Resource::loadPixmap( "enter" ) , tr("&Accept"), 0, this);
+    editAccept=new QAction(tr("Accept"),
+                           Opie::Core::OResource::loadPixmap( "enter", Opie::Core::OResource::SmallIcon ),
+                           tr("&Accept"), 0, this);
     connect(editAccept, SIGNAL(activated()), this, SLOT(slotEditAccept()));
-    editCancel=new QAction(tr("Cancel"), Resource::loadPixmap( "close" ), tr("&Cancel"), 0, this);
+    editCancel=new QAction(tr("Cancel"),
+                           Opie::Core::OResource::loadPixmap( "close", Opie::Core::OResource::SmallIcon ),
+                           tr("&Cancel"), 0, this);
     connect(editCancel, SIGNAL(activated()), this, SLOT(slotEditCancel()));
-    editCellSelect=new QAction(tr("Cell Selector"), Resource::loadPixmap( "opie-sheet/cell-select" ), tr("Cell &Selector"), 0, this);
+    editCellSelect=new QAction(tr("Cell Selector"),
+                               Opie::Core::OResource::loadPixmap( "opie-sheet/cell-select", Opie::Core::OResource::SmallIcon ),
+                               tr("Cell &Selector"), 0, this);
     editCellSelect->setToggleAction(TRUE);
     connect(editCellSelect, SIGNAL(toggled(bool)), this, SLOT(slotCellSelect(bool)));
     editCut=new QAction(tr("Cut Cells"), tr("Cu&t"), 0, this);
     editCopy=new QAction(tr("Copy Cells"), tr("&Copy"), 0, this);
     editPaste=new QAction(tr("Paste Cells"), tr("&Paste"), 0, this);
     connect(editPaste, SIGNAL(activated()), this, SLOT(slotEditPaste()));
     editPasteContents=new QAction(tr("Paste Contents"), tr("Paste Cont&ents"), 0, this);
     connect(editPasteContents, SIGNAL(activated()), this, SLOT(slotEditPasteContents()));
     editClear=new QAction(tr("Clear Cells"), tr("C&lear"), 0, this);
 
     insertCells=new QAction(tr("Insert Cells"), tr("C&ells"), 0, this);
     connect(insertCells, SIGNAL(activated()), this, SLOT(slotInsertCells()));
     insertRows=new QAction(tr("Insert Rows"), tr("&Rows"), 0, this);
     connect(insertRows, SIGNAL(activated()), this, SLOT(slotInsertRows()));
     insertCols=new QAction(tr("Insert Columns"), tr("&Columns"), 0, this);
     connect(insertCols, SIGNAL(activated()), this, SLOT(slotInsertCols()));
     insertSheets=new QAction(tr("Add Sheets"), tr("&Sheets"), 0, this);
     connect(insertSheets, SIGNAL(activated()), this, SLOT(slotInsertSheets()));
 
     formatCells=new QAction(tr("Cells"), tr("&Cells"), 0, this);
     connect(formatCells, SIGNAL(activated()), this, SLOT(slotFormatCells()));
 
     rowHeight=new QAction(tr("Row Height"), tr("H&eight"), 0, this);
     connect(rowHeight, SIGNAL(activated()), this, SLOT(slotRowHeight()));
     rowAdjust=new QAction(tr("Adjust Row"), tr("&Adjust"), 0, this);
     connect(rowAdjust, SIGNAL(activated()), this, SLOT(slotRowAdjust()));
     rowShow=new QAction(tr("Show Row"), tr("&Show"), 0, this);
     connect(rowShow, SIGNAL(activated()), this, SLOT(slotRowShow()));
     rowHide=new QAction(tr("Hide Row"), tr("&Hide"), 0, this);
     connect(rowHide, SIGNAL(activated()), this, SLOT(slotRowHide()));
 
     colWidth=new QAction(tr("Column Width"), tr("&Width"), 0, this);
     connect(colWidth, SIGNAL(activated()), this, SLOT(slotColumnWidth()));
     colAdjust=new QAction(tr("Adjust Column"), tr("&Adjust"), 0, this);
     connect(colAdjust, SIGNAL(activated()), this, SLOT(slotColumnAdjust()));
     colShow=new QAction(tr("Show Column"), tr("&Show"), 0, this);
     connect(colShow, SIGNAL(activated()), this, SLOT(slotColumnShow()));
     colHide=new QAction(tr("Hide Column"), tr("&Hide"), 0, this);
     connect(colHide, SIGNAL(activated()), this, SLOT(slotColumnHide()));
 
     sheetRename=new QAction(tr("Rename Sheet"), tr("&Rename"), 0, this);
     connect(sheetRename, SIGNAL(activated()), this, SLOT(slotSheetRename()));
     sheetRemove=new QAction(tr("Remove Sheet"), tr("R&emove"), 0, this);
     connect(sheetRemove, SIGNAL(activated()), this, SLOT(slotSheetRemove()));
 
     dataSort=new QAction(tr("Sort Data"), tr("&Sort"), 0, this);
     connect(dataSort, SIGNAL(activated()), this, SLOT(slotDataSort()));
     dataFindReplace=new QAction(tr("Find && Replace"), tr("&Find && Replace"), 0, this);
     connect(dataFindReplace, SIGNAL(activated()), this, SLOT(slotDataFindReplace()));
 
-    funcEqual=new QAction(tr("Equal To"), Resource::loadPixmap( "opie-sheet/func-equal" ), tr("&Equal To"), 0, this);
+    funcEqual=new QAction(tr("Equal To"),
+                          Opie::Core::OResource::loadPixmap( "opie-sheet/func-equal", Opie::Core::OResource::SmallIcon ),
+                          tr("&Equal To"), 0, this);
     funcEqual->setToolTip("=");
     connect(funcEqual, SIGNAL(activated()), this, SLOT(slotFuncOutput()));
-    funcPlus=new QAction(tr("Addition"), Resource::loadPixmap( "opie-sheet/func-plus" ), tr("&Addition"), 0, this);
+    funcPlus=new QAction(tr("Addition"),
+                         Opie::Core::OResource::loadPixmap( "opie-sheet/func-plus", Opie::Core::OResource::SmallIcon ),
+                         tr("&Addition"), 0, this);
     funcPlus->setToolTip("+");
     connect(funcPlus, SIGNAL(activated()), this, SLOT(slotFuncOutput()));
-    funcMinus=new QAction(tr("Subtraction"), Resource::loadPixmap( "opie-sheet/func-minus" ), tr("&Subtraction"), 0, this);
+    funcMinus=new QAction(tr("Subtraction"),
+                          Opie::Core::OResource::loadPixmap( "opie-sheet/func-minus", Opie::Core::OResource::SmallIcon ),
+                          tr("&Subtraction"), 0, this);
     funcMinus->setToolTip("-");
     connect(funcMinus, SIGNAL(activated()), this, SLOT(slotFuncOutput()));
-    funcCross=new QAction(tr("Multiplication"), Resource::loadPixmap ("opie-sheet/func-cross" ), tr("&Multiplication"), 0, this);
+    funcCross=new QAction(tr("Multiplication"),
+                          Opie::Core::OResource::loadPixmap ("opie-sheet/func-cross", Opie::Core::OResource::SmallIcon ),
+                          tr("&Multiplication"), 0, this);
     funcCross->setToolTip("*");
     connect(funcCross, SIGNAL(activated()), this, SLOT(slotFuncOutput()));
-    funcDivide=new QAction(tr("Division"), Resource::loadPixmap( "opie-sheet/func-divide" ), tr("&Division"), 0, this);
+    funcDivide=new QAction(tr("Division"),
+                           Opie::Core::OResource::loadPixmap( "opie-sheet/func-divide", Opie::Core::OResource::SmallIcon ),
+                           tr("&Division"), 0, this);
     funcDivide->setToolTip("/");
     connect(funcDivide, SIGNAL(activated()), this, SLOT(slotFuncOutput()));
-    funcParanOpen=new QAction(tr("Open ParanthesistempCellData->row+row1, tempCellData->col+col1"), Resource::loadPixmap( "opie-sheet/func-paran-open" ), tr("&Open Paranthesis"), 0, this);
+    funcParanOpen=new QAction(tr("Open ParanthesistempCellData->row+row1, tempCellData->col+col1"),
+                              Opie::Core::OResource::loadPixmap( "opie-sheet/func-paran-open", Opie::Core::OResource::SmallIcon ),
+                              tr("&Open Paranthesis"), 0, this);
     funcParanOpen->setToolTip("(");
     connect(funcParanOpen, SIGNAL(activated()), this, SLOT(slotFuncOutput()));
-    funcParanClose=new QAction(tr("Close Paranthesis"), Resource::loadPixmap( "opie-sheet/func-paran-close" ), tr("&Close Paranthesis"), 0, this);
+    funcParanClose=new QAction(tr("Close Paranthesis"),
+                               Opie::Core::OResource::loadPixmap( "opie-sheet/func-paran-close", Opie::Core::OResource::SmallIcon ),
+                               tr("&Close Paranthesis"), 0, this);
     funcParanClose->setToolTip(")");
     connect(funcParanClose, SIGNAL(activated()), this, SLOT(slotFuncOutput()));
-    funcComma=new QAction(tr("Comma"), Resource::loadPixmap( "opie-sheet/func-comma" ), tr("&Comma"), 0, this);
+    funcComma=new QAction(tr("Comma"),
+                          Opie::Core::OResource::loadPixmap( "opie-sheet/func-comma", Opie::Core::OResource::SmallIcon ),
+                          tr("&Comma"), 0, this);
     funcComma->setToolTip(",");
     connect(funcComma, SIGNAL(activated()), this, SLOT(slotFuncOutput()));
 }
 
 void MainWindow::initMenu()
 {
     menu=new QMenuBar(this);
 
     menuFile=new QPopupMenu;
     fileNew->addTo(menuFile);
     fileOpen->addTo(menuFile);
     fileSave->addTo(menuFile);
     fileSaveAs->addTo(menuFile);
     //  menuFile->insertSeparator();
     //  fileQuit->addTo(menuFile);
     menuFile->insertSeparator();
     fileExcelImport->addTo(menuFile);
     menu->insertItem(tr("&File"), menuFile);
 
     menuEdit=new QPopupMenu;
     editAccept->addTo(menuEdit);
     editCancel->addTo(menuEdit);
     editCellSelect->addTo(menuEdit);
     menuEdit->insertSeparator();
     editCut->addTo(menuEdit);
     editCopy->addTo(menuEdit);
     editPaste->addTo(menuEdit);
     editPasteContents->addTo(menuEdit);
     editClear->addTo(menuEdit);
     menu->insertItem(tr("&Edit"), menuEdit);
 
     menuInsert=new QPopupMenu;
     menu->insertItem(tr("&Insert"), menuInsert);
 
     menuFormat=new QPopupMenu;
     formatCells->addTo(menuFormat);
     menu->insertItem(tr("&Format"), menuFormat);
 
     menuData=new QPopupMenu;
     dataSort->addTo(menuData);
     dataFindReplace->addTo(menuData);
     menu->insertItem(tr("&Data"), menuData);
 
     //  menuHelp=new QPopupMenu;
     // helpGeneral->addTo(menuHelp);
     //  helpAbout->addTo(menuHelp);
     //  menu->insertItem(tr("&Help"), menuHelp);
 
     submenuRow=new QPopupMenu;
     rowHeight->addTo(submenuRow);
     rowAdjust->addTo(submenuRow);
     rowShow->addTo(submenuRow);
     rowHide->addTo(submenuRow);
     menuFormat->insertItem(tr("&Row"), submenuRow);
 
     submenuCol=new QPopupMenu;
     colWidth->addTo(submenuCol);
     colAdjust->addTo(submenuCol);
     colShow->addTo(submenuCol);
     colHide->addTo(submenuCol);
     menuFormat->insertItem(tr("Colum&n"), submenuCol);
 
     submenuSheet=new QPopupMenu;
     sheetRename->addTo(submenuSheet);
     sheetRemove->addTo(submenuSheet);
     menuFormat->insertItem(tr("&Sheet"), submenuSheet);
 
     submenuFunc=new QPopupMenu;
     menuInsert->insertItem(tr("&Function"), submenuFunc);
 
     submenuFuncStd=new QPopupMenu;
     funcPlus->addTo(submenuFuncStd);
     funcMinus->addTo(submenuFuncStd);
     funcCross->addTo(submenuFuncStd);
     funcDivide->addTo(submenuFuncStd);
     submenuFunc->insertItem(tr("&Simple"), submenuFuncStd);
 
 
 
     submenuFuncStandard=new QPopupMenu;
     addFlyAction(tr("ABS(x)"), tr("ABS(x)"), "ABS(", submenuFuncStandard);
     addFlyAction(tr("CEILING(x,acc)"), tr("CEILING(x,acc)"), "CEILING(", submenuFuncStandard);
     addFlyAction(tr("FACT(x)"), tr("FACT(x)"), "FACT(", submenuFuncStandard);
     addFlyAction(tr("FLOOR(x,acc)"), tr("FLOOR(x,acc)"), "FLOOR(", submenuFuncStandard);
     addFlyAction(tr("INT(x)"), tr("INT(x)"), "INT(", submenuFuncStandard);
     addFlyAction(tr("MOD(x,y)"), tr("MOD(x,y)"), "MOD(", submenuFuncStandard);
     addFlyAction(tr("ROUND(x,digits)"), tr("ROUND(x,digits)"), "ROUND(", submenuFuncStandard);
     addFlyAction(tr("SIGN(x)"), tr("SIGN(x)"), "SIGN(", submenuFuncStandard);
     submenuFuncStandard->insertSeparator();
     addFlyAction(tr("EXP(x)"), tr("EXP(x)"), "EXP(", submenuFuncStandard);
     addFlyAction(tr("LN(x)"), tr("LN(x)"), "LN(", submenuFuncStandard);
     addFlyAction(tr("LOG(x,b)"), tr("LOG(x,b)"), "LOG(", submenuFuncStandard);
     addFlyAction(tr("LOG10(x)"), tr("LOG10(x)"), "LOG10(", submenuFuncStandard);
     addFlyAction(tr("POWER(x,y)"), tr("POWER(x,y)"), "POWER(", submenuFuncStandard);
     addFlyAction(tr("SQRT(x)"), tr("SQRT(x)"), "SQRT(", submenuFuncStandard);
     submenuFuncStandard->insertSeparator();
@@ -527,193 +559,194 @@ void MainWindow::initMenu()
     addFlyAction(tr("MID(s,pos,len)"), tr("MID(s,pos,len)"), "MID(",submenuFuncString);
     submenuFuncString->insertSeparator();
     addFlyAction(tr("CONCATENATE(s1,s2..)"), tr("CONCATENATE(s1,s2..)"), "CONCATENATE(",submenuFuncString);
     addFlyAction(tr("EXACT(s1,s2)"), tr("EXACT(s1,s2)"), "EXACT(",submenuFuncString);
     addFlyAction(tr("FIND(what,where,pos)"),
                  tr("FIND(what,where,pos)"), "FIND(",submenuFuncString);
     addFlyAction(tr("REPLACE(s,pos,len,ns)"), tr("REPLACE(s,pos,len,ns)"), "REPLACE(",submenuFuncString);
     addFlyAction(tr("REPT(s,n)"), tr("REPT(s,n)"), "REPT(",submenuFuncString);
     submenuFuncString->insertSeparator();
     addFlyAction(tr("UPPER(s)"), tr("UPPER(s)"), "UPPER(",submenuFuncString);
     addFlyAction(tr("LOWER(s)"), tr("LOWER(s)"), "LOWER(",submenuFuncString);
     submenuFunc->insertItem(tr("&Strings"), submenuFuncString);
 
     submenuFuncStat=new QPopupMenu;
     addFlyAction(tr("AVERAGE(range)"), tr("AVERAGE(range)"), "AVERAGE(",submenuFuncStat);
     addFlyAction(tr("COUNT(range)"), tr("COUNT(range)"), "COUNT(",submenuFuncStat);
     addFlyAction(tr("COUNTIF(range,eqls)"), tr("COUNTIF(range,eqls)"), "COUNTIF(",submenuFuncStat);
     addFlyAction(tr("MAX(range)"), tr("MAX(range)"), "MAX(",submenuFuncStat);
     addFlyAction(tr("MIN(range)"), tr("MIN(range)"), "MIN(",submenuFuncStat);
     addFlyAction(tr("SUM(range)"), tr("SUM(range)"), "SUM(",submenuFuncStat);
     addFlyAction(tr("SUMSQ(range)"), tr("SUMSQ(range)"), "SUMSQ(",submenuFuncStat);
     submenuFuncStat->insertSeparator();
     addFlyAction(tr("AVERAGE(range)"), tr("AVERAGE(range)"), "AVERAGE(",submenuFuncStat);
     addFlyAction(tr("VAR(range)"), tr("VAR(range)"), "VAR(",submenuFuncStat);
     addFlyAction(tr("VARP(range)"), tr("VARP(range)"), "VARP(",submenuFuncStat);
     addFlyAction(tr("STDEV(range)"), tr("STDEV(range)"), "STDEV(",submenuFuncStat);
     addFlyAction(tr("STDEVP(range)"), tr("STDEVP(range)"), "STDEVP(",submenuFuncStat);
     addFlyAction(tr("SKEW(range)"), tr("SKEW(range)"), "SKEW(",submenuFuncStat);
     addFlyAction(tr("KURT(range)"), tr("KURT(range)"), "KURT(",submenuFuncStat);
     submenuFunc->insertItem(tr("Sta&tistical"), submenuFuncStat);
 
     submenuFuncScientific=new QPopupMenu;
     addFlyAction(tr("BESSELI(x,n)"), tr("BESSELI(x,n)"), "BESSELI(",submenuFuncScientific);
     addFlyAction(tr("BESSELJ(x,n)"), tr("BESSELJ(x,n)"), "BESSELJ(",submenuFuncScientific);
     addFlyAction(tr("BESSELK(x,n)"), tr("BESSELK(x,n)"), "BESSELK(",submenuFuncScientific);
     addFlyAction(tr("BESSELY(x,n)"), tr("BESSELY(x,n)"), "BESSELY(",submenuFuncScientific);
     submenuFuncScientific->insertSeparator();
     addFlyAction(tr("BETAI(x,a,b)"), tr("BETAI(x,a,b)"), "BETAI(",submenuFuncScientific);
     addFlyAction(tr("ERF(a,b)"), tr("ERF(a,b)"), "ERF(",submenuFuncScientific);
     addFlyAction(tr("ERFC(a,b)"), tr("ERFC(a,b)"), "ERFC(",submenuFuncScientific);
     addFlyAction(tr("GAMMALN(x)"), tr("GAMMALN(x)"), "GAMMALN(",submenuFuncScientific);
     addFlyAction(tr("GAMMAP(x,a)"), tr("GAMMAP(x,a)"), "GAMMAP(",submenuFuncScientific);
     addFlyAction(tr("GAMMAQ(x,a)"), tr("GAMMAQ(x,a)"), "GAMMAQ(",submenuFuncScientific);
     submenuFunc->insertItem(tr("Scienti&fic"), submenuFuncScientific);
 
     submenuFuncDistr=new QPopupMenu;
     addFlyAction(tr("BETADIST(z,a,b,Q?)"), tr("BETADIST(z,a,b,Q?)"), "BETADIST(",submenuFuncDistr);
     addFlyAction(tr("CHI2DIST(x,n,Q?)"), tr("CHI2DIST(x,n,Q?)"), "CHI2DIST(",submenuFuncDistr);
     addFlyAction(tr("CHIDIST(x,n,Q?)"), tr("CHIDIST(x,n,Q?)"), "CHIDIST(",submenuFuncDistr);
     addFlyAction(tr("FDIST(z,deg1,deg2,Q?)"), tr("FDIST(z,deg1,deg2,Q?)"), "FDIST(",submenuFuncDistr);
     addFlyAction(tr("GAMMADIST(x,a,b,Q?)"), tr("GAMMADIST(x,a,b,Q?)"), "GAMMADIST(",submenuFuncDistr);
     addFlyAction(tr("NORMALDIST(x,m,s,Q?)"), tr("NORMALDIST(x,m,s,Q?)"), "NORMALDIST(",submenuFuncDistr);
     addFlyAction(tr("PHI(x,Q?)"), tr("PHI(x,Q?)"), "PHI(",submenuFuncDistr);
     addFlyAction(tr("POISSON(x,n,Q?)"), tr("POISSON(x,n,Q?)"), "POISSON(",submenuFuncDistr);
     submenuFunc->insertItem(tr("&Distributions"), submenuFuncDistr);
 
 
 
     menuInsert->insertSeparator();
     insertCells->addTo(menuInsert);
     insertRows->addTo(menuInsert);
     insertCols->addTo(menuInsert);
     insertSheets->addTo(menuInsert);
 }
 
 void MainWindow::initStandardToolbar()
 {
     toolbarStandard=new QToolBar(this);
     toolbarStandard->setHorizontalStretchable(TRUE);
     moveToolBar(toolbarStandard, Top);
 
     fileNew->addTo(toolbarStandard);
     fileOpen->addTo(toolbarStandard);
     fileSave->addTo(toolbarStandard);
 
     comboSheets=new QComboBox(toolbarStandard);
     toolbarStandard->setStretchableWidget(comboSheets);
     connect(comboSheets, SIGNAL(activated(const QString&)), this, SLOT(slotSheetChanged(const QString&)));
 }
 
 void MainWindow::initFunctionsToolbar()
 {
     toolbarFunctions=new QToolBar(this);
     toolbarFunctions->setHorizontalStretchable(TRUE);
     moveToolBar(toolbarFunctions, Bottom);
 
     funcEqual->addTo(toolbarFunctions);
     funcPlus->addTo(toolbarFunctions);
     funcMinus->addTo(toolbarFunctions);
     funcCross->addTo(toolbarFunctions);
     funcDivide->addTo(toolbarFunctions);
     funcParanOpen->addTo(toolbarFunctions);
     funcParanClose->addTo(toolbarFunctions);
     funcComma->addTo(toolbarFunctions);
 
     toolFunction=new QToolButton(toolbarFunctions);
-    toolFunction->setPixmap(Resource::loadPixmap( "opie-sheet/func-func" ));
+    toolFunction->setUsesBigPixmap( qApp->desktop()->size().width() > 330 );
+    toolFunction->setPixmap(Opie::Core::OResource::loadPixmap( "opie-sheet/func-func", Opie::Core::OResource::SmallIcon ));
     toolFunction->setTextLabel(tr("Functions"));
     toolFunction->setPopup(submenuFunc);
     toolFunction->setPopupDelay(0);
 }
 
 void MainWindow::initEditToolbar()
 {
     toolbarEdit=new QToolBar(this);
     toolbarEdit->setHorizontalStretchable(TRUE);
     moveToolBar(toolbarEdit, Bottom);
 
     editAccept->addTo(toolbarEdit);
     editCancel->addTo(toolbarEdit);
 
     editData=new QLineEdit(toolbarEdit);
     toolbarEdit->setStretchableWidget(editData);
     connect(editData, SIGNAL(returnPressed()), this, SLOT(slotEditAccept()));
 
     editCellSelect->addTo(toolbarEdit);
 }
 
 void MainWindow::slotHelpAbout()
 {
     QDialog dialogAbout(this, 0, TRUE);
     dialogAbout.resize(width()-40, height()-80);
     dialogAbout.setCaption(tr("About Opie Sheet"));
 
     QLabel label(tr("Opie Sheet\nSpreadsheet Software for Opie\nQWDC Beta Winner (as Sheet/Qt)\n\nDeveloped by: Serdar Ozler\nRelease 1.0.2\nRelease Date: October 08, 2002\n\nThis product is licensed under GPL. It is freely distributable. If you want to get the latest version and also the source code, please visit the web site.\n\nhttp://qtopia.sitebest.com"), &dialogAbout);
     label.setGeometry(dialogAbout.rect());
     label.setAlignment(Qt::AlignCenter | Qt::WordBreak);
 
     dialogAbout.exec();
 }
 
 void MainWindow::initSheet()
 {
     sheet=new Sheet(DEFAULT_NUM_ROWS, DEFAULT_NUM_COLS, this);
     setCentralWidget(sheet);
 
     connect(sheet, SIGNAL(currentDataChanged(const QString&)), editData, SLOT(setText(const QString&)));
     connect(sheet, SIGNAL(cellClicked(const QString&)), this, SLOT(slotCellClicked(const QString&)));
     connect(sheet, SIGNAL(sheetModified()), this, SLOT(slotDocModified()));
 
     connect(editCut, SIGNAL(activated()), sheet, SLOT(editCut()));
     connect(editCopy, SIGNAL(activated()), sheet, SLOT(editCopy()));
     connect(editClear, SIGNAL(activated()), sheet, SLOT(editClear()));
 }
 
 void MainWindow::slotEditAccept()
 {
     sheet->setData(editData->text());
 }
 
 void MainWindow::slotEditCancel()
 {
     editData->setText(sheet->getData());
 }
 
 void MainWindow::slotCellSelect(bool lock)
 {
     sheet->lockClicks(lock);
 }
 
 void MainWindow::addToData(const QString &data)
 {
     editData->setText(editData->text().insert(editData->cursorPosition(), data));
 }
 
 void MainWindow::slotFuncOutput()
 {
     if (sender()->isA("QAction"))
         addToData(((QAction *)sender())->toolTip());
 }
 
 void MainWindow::slotInsertRows()
 {
     NumberDialog dialogNumber(this);
     if (dialogNumber.exec(tr("Insert Rows"), tr("&Number of rows:"))==QDialog::Accepted)
         sheet->insertRows(dialogNumber.getValue());
 }
 
 void MainWindow::slotInsertCols()
 {
     NumberDialog dialogNumber(this);
     if (dialogNumber.exec(tr("Insert Columns"), tr("&Number of columns:"))==QDialog::Accepted)
         sheet->insertColumns(dialogNumber.getValue());
 }
 
 void MainWindow::slotInsertSheets()
 {
     NumberDialog dialogNumber(this);
     if (dialogNumber.exec(tr("Add Sheets"), tr("&Number of sheets:"))==QDialog::Accepted)
         for (int i=dialogNumber.getValue(); i>0; --i) createNewSheet();
 }
 
 void MainWindow::slotCellClicked(const QString &cell)