corrected resource names for icons.

2 files changed, 12 insertions, 10 deletions

diff --git a/noncore/apps/opie-sheet/ChangeLog b/noncore/apps/opie-sheet/ChangeLog
index 0370156..69c96f8 100644
--- a/noncore/apps/opie-sheet/ChangeLog
+++ b/noncore/apps/opie-sheet/ChangeLog
@@ -1,32 +1,34 @@
+January 9, 2004 corrected the names of the resource icons in mainwindow.cpp.... So now they are loaded fine.
+
 January 8, 2004
 	- converted icons from xpm to png and moved them to $OPIEDIR/pics/opie-sheet
 	- modified mainwindow.cpp to load pixmaps with Resource::loadPixmap(resourcename) in contrast to the old QPixmap(nameofthe_xpm_included_in_the_opie-sheet_dir)
 	- changed pics/opie-sheet/sheetqt.png entry in control file to pics/opie-sheet/*.png
 
 January 8, 2004
 	- fixed issue : "-if someone enters directly text as parameter to a string function the text renders as uppercase due to the calculation engine that uppercases all the parsing sentence."
 	now the text is handled correctly.
 
 January 7, 2004
 	* Release by hayzel (koppermind@panafonet.gr)
 	This version has many valuable changes, though It may have some annoying bugs. Please if you are interested in opie-sheet try it hard, so I can fix some of them. Also If you want some other functions that must be here and are missing feel free to ask them. (no financial functions please. :)  I really hate them )
 	-Fixed a bug with non closed parenthesis editing&recalculation infinite loop.
 	-Added support for functions that can parse parameters not ONLY as numbers but also as strings.
 	-Added many functions that cover many computational topics rendering opie-sheet a computational tool-spreadsheet at last. (total 90 functions!)
 	-Maintained compatibility with the opie-fileformat.
 	-New icons.
 	-Found that the DataParser was not a real RPN compiler of the expressions. In fact it was returning faulty results in calculations, in both binary or unary operations. A1-A2-A3 was parsed as A1-(A2-A3). -A1 was parsed as A1.
 	-Added new class "Expression" a general Parser for spreadsheet-expression. Imported from an old C# project of mine.
 	-Now can also parse <>=!%&^|"" in expressions.
 	-Added experimental Excel File format import!. The opie-sheet can import any excel file in BIFF7/BIFF8 format. These formats are used in Excel XP,2000,95. The Excel Importer class is in a good coding level.. BUT it is not complete. Only strings,numbers,formulas are imported. Not formatting rules. Not all the functions are converted in the functions of opie-sheet. Infact FEW functions are converted.
 	-Fixed a bug with Sheet Recalculation. Added ReCalc() function. Opie-sheet was calculating wrong the values of expression in opening/importing. if a value needed was not loaded yet in the time of calculation. Solved with ReCalc() each time the active sheet is changing.
 
 
 	*known issues:
 	-if someone enters directly text as parameter to a string function the text renders as uppercase due to the calculation engine that uppercases all the parsing sentence.
 	-randbetween return only integer part random... if both limit numbers are integers.
 	-skew and kurt function give different results compared to kspread-oofice equivalents.
 	-unstable parser Excel Class
 	-string vars and string functions are not correctly handled by excel importer.
 	-unicode strings are converted FINE in QString unicode format, but cannot be rendered fine if a suitable unicode font is not setuped as the default string. So the string is junked in the opie-sheet and may crash the parser.
 
diff --git a/noncore/apps/opie-sheet/mainwindow.cpp b/noncore/apps/opie-sheet/mainwindow.cpp
index 07e581a..bd98aca 100644
--- a/noncore/apps/opie-sheet/mainwindow.cpp
+++ b/noncore/apps/opie-sheet/mainwindow.cpp
@@ -263,137 +263,137 @@ void MainWindow::slotFileSave()
 }
 
 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);
   connect(fileNew, SIGNAL(activated()), this, SLOT(slotFileNew()));
   fileOpen=new QAction(tr("Open File"), Resource::loadPixmap( "fileopen" ), tr("&Open"), 0, this);
   connect(fileOpen, SIGNAL(activated()), this, SLOT(slotFileOpen()));
   fileSave=new QAction(tr("Save File"),Resource::loadPixmap( "save" ), 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);
   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);
   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);
   connect(editAccept, SIGNAL(activated()), this, SLOT(slotEditAccept()));
   editCancel=new QAction(tr("Cancel"), Resource::loadPixmap( "close" ), 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"), Resource::loadPixmap( "opie-sheet/cell-select" ), 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"), Resource::loadPixmap( "opie-sheet/func-equal" ), 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"), Resource::loadPixmap( "opie-sheet/func-plus" ), 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"), Resource::loadPixmap( "opie-sheet/func-minus" ), 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"), Resource::loadPixmap ("opie-sheet/func-cross" ), 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"), Resource::loadPixmap( "opie-sheet/func-divide" ), 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"), Resource::loadPixmap( "opie-sheet/func-paran-open" ), 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"), Resource::loadPixmap( "opie-sheet/func-paran-close" ), 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"), Resource::loadPixmap( "opie-sheet/func-comma" ), 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;
@@ -571,65 +571,65 @@ void MainWindow::initMenu()
 
 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->setPixmap(Resource::loadPixmap( "opie-sheet/func-func" ));
   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();