summaryrefslogtreecommitdiff
authorhayzel <hayzel>2004-01-09 21:34:15 (UTC)
committer hayzel <hayzel>2004-01-09 21:34:15 (UTC)
commit6a5b22e96544806b7d08454071bad435ac237f10 (patch) (unidiff)
treeba63be3f240919aea54368cac150ad67b654bf29
parent29961a27e46a5ebf000690339243ec51e55a6b5a (diff)
downloadopie-6a5b22e96544806b7d08454071bad435ac237f10.zip
opie-6a5b22e96544806b7d08454071bad435ac237f10.tar.gz
opie-6a5b22e96544806b7d08454071bad435ac237f10.tar.bz2
corrected resource names for icons.
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/apps/opie-sheet/ChangeLog2
-rw-r--r--noncore/apps/opie-sheet/mainwindow.cpp20
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,3 +1,5 @@
1January 9, 2004 corrected the names of the resource icons in mainwindow.cpp.... So now they are loaded fine.
2
1January 8, 2004 3January 8, 2004
2 - converted icons from xpm to png and moved them to $OPIEDIR/pics/opie-sheet 4 - converted icons from xpm to png and moved them to $OPIEDIR/pics/opie-sheet
3 - modified mainwindow.cpp to load pixmaps with Resource::loadPixmap(resourcename) in contrast to the old QPixmap(nameofthe_xpm_included_in_the_opie-sheet_dir) 5 - modified mainwindow.cpp to load pixmaps with Resource::loadPixmap(resourcename) in contrast to the old QPixmap(nameofthe_xpm_included_in_the_opie-sheet_dir)
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
@@ -292,7 +292,7 @@ void MainWindow::initActions()
292 connect(editAccept, SIGNAL(activated()), this, SLOT(slotEditAccept())); 292 connect(editAccept, SIGNAL(activated()), this, SLOT(slotEditAccept()));
293 editCancel=new QAction(tr("Cancel"), Resource::loadPixmap( "close" ), tr("&Cancel"), 0, this); 293 editCancel=new QAction(tr("Cancel"), Resource::loadPixmap( "close" ), tr("&Cancel"), 0, this);
294 connect(editCancel, SIGNAL(activated()), this, SLOT(slotEditCancel())); 294 connect(editCancel, SIGNAL(activated()), this, SLOT(slotEditCancel()));
295 editCellSelect=new QAction(tr("Cell Selector"), Resource::loadPixmap( "opie-sheet/cell_select" ), tr("Cell &Selector"), 0, this); 295 editCellSelect=new QAction(tr("Cell Selector"), Resource::loadPixmap( "opie-sheet/cell-select" ), tr("Cell &Selector"), 0, this);
296 editCellSelect->setToggleAction(TRUE); 296 editCellSelect->setToggleAction(TRUE);
297 connect(editCellSelect, SIGNAL(toggled(bool)), this, SLOT(slotCellSelect(bool))); 297 connect(editCellSelect, SIGNAL(toggled(bool)), this, SLOT(slotCellSelect(bool)));
298 editCut=new QAction(tr("Cut Cells"), tr("Cu&t"), 0, this); 298 editCut=new QAction(tr("Cut Cells"), tr("Cu&t"), 0, this);
@@ -343,28 +343,28 @@ void MainWindow::initActions()
343 dataFindReplace=new QAction(tr("Find && Replace"), tr("&Find && Replace"), 0, this); 343 dataFindReplace=new QAction(tr("Find && Replace"), tr("&Find && Replace"), 0, this);
344 connect(dataFindReplace, SIGNAL(activated()), this, SLOT(slotDataFindReplace())); 344 connect(dataFindReplace, SIGNAL(activated()), this, SLOT(slotDataFindReplace()));
345 345
346 funcEqual=new QAction(tr("Equal To"), Resource::loadPixmap( "opie-sheet/func_equal" ), tr("&Equal To"), 0, this); 346 funcEqual=new QAction(tr("Equal To"), Resource::loadPixmap( "opie-sheet/func-equal" ), tr("&Equal To"), 0, this);
347 funcEqual->setToolTip("="); 347 funcEqual->setToolTip("=");
348 connect(funcEqual, SIGNAL(activated()), this, SLOT(slotFuncOutput())); 348 connect(funcEqual, SIGNAL(activated()), this, SLOT(slotFuncOutput()));
349 funcPlus=new QAction(tr("Addition"), Resource::loadPixmap( "opie-sheet/func_plus" ), tr("&Addition"), 0, this); 349 funcPlus=new QAction(tr("Addition"), Resource::loadPixmap( "opie-sheet/func-plus" ), tr("&Addition"), 0, this);
350 funcPlus->setToolTip("+"); 350 funcPlus->setToolTip("+");
351 connect(funcPlus, SIGNAL(activated()), this, SLOT(slotFuncOutput())); 351 connect(funcPlus, SIGNAL(activated()), this, SLOT(slotFuncOutput()));
352 funcMinus=new QAction(tr("Subtraction"), Resource::loadPixmap( "opie-sheet/func_minus" ), tr("&Subtraction"), 0, this); 352 funcMinus=new QAction(tr("Subtraction"), Resource::loadPixmap( "opie-sheet/func-minus" ), tr("&Subtraction"), 0, this);
353 funcMinus->setToolTip("-"); 353 funcMinus->setToolTip("-");
354 connect(funcMinus, SIGNAL(activated()), this, SLOT(slotFuncOutput())); 354 connect(funcMinus, SIGNAL(activated()), this, SLOT(slotFuncOutput()));
355 funcCross=new QAction(tr("Multiplication"), Resource::loadPixmap ("opie-sheet/func_cross" ), tr("&Multiplication"), 0, this); 355 funcCross=new QAction(tr("Multiplication"), Resource::loadPixmap ("opie-sheet/func-cross" ), tr("&Multiplication"), 0, this);
356 funcCross->setToolTip("*"); 356 funcCross->setToolTip("*");
357 connect(funcCross, SIGNAL(activated()), this, SLOT(slotFuncOutput())); 357 connect(funcCross, SIGNAL(activated()), this, SLOT(slotFuncOutput()));
358 funcDivide=new QAction(tr("Division"), Resource::loadPixmap( "opie-sheet/func_divide" ), tr("&Division"), 0, this); 358 funcDivide=new QAction(tr("Division"), Resource::loadPixmap( "opie-sheet/func-divide" ), tr("&Division"), 0, this);
359 funcDivide->setToolTip("/"); 359 funcDivide->setToolTip("/");
360 connect(funcDivide, SIGNAL(activated()), this, SLOT(slotFuncOutput())); 360 connect(funcDivide, SIGNAL(activated()), this, SLOT(slotFuncOutput()));
361 funcParanOpen=new QAction(tr("Open ParanthesistempCellData->row+row1, tempCellData->col+col1"), Resource::loadPixmap( "opie-sheet/func_paran_open" ), tr("&Open Paranthesis"), 0, this); 361 funcParanOpen=new QAction(tr("Open ParanthesistempCellData->row+row1, tempCellData->col+col1"), Resource::loadPixmap( "opie-sheet/func-paran-open" ), tr("&Open Paranthesis"), 0, this);
362 funcParanOpen->setToolTip("("); 362 funcParanOpen->setToolTip("(");
363 connect(funcParanOpen, SIGNAL(activated()), this, SLOT(slotFuncOutput())); 363 connect(funcParanOpen, SIGNAL(activated()), this, SLOT(slotFuncOutput()));
364 funcParanClose=new QAction(tr("Close Paranthesis"), Resource::loadPixmap( "opie-sheet/func_paran_close" ), tr("&Close Paranthesis"), 0, this); 364 funcParanClose=new QAction(tr("Close Paranthesis"), Resource::loadPixmap( "opie-sheet/func-paran-close" ), tr("&Close Paranthesis"), 0, this);
365 funcParanClose->setToolTip(")"); 365 funcParanClose->setToolTip(")");
366 connect(funcParanClose, SIGNAL(activated()), this, SLOT(slotFuncOutput())); 366 connect(funcParanClose, SIGNAL(activated()), this, SLOT(slotFuncOutput()));
367 funcComma=new QAction(tr("Comma"), Resource::loadPixmap( "opie-sheet/func_comma" ), tr("&Comma"), 0, this); 367 funcComma=new QAction(tr("Comma"), Resource::loadPixmap( "opie-sheet/func-comma" ), tr("&Comma"), 0, this);
368 funcComma->setToolTip(","); 368 funcComma->setToolTip(",");
369 connect(funcComma, SIGNAL(activated()), this, SLOT(slotFuncOutput())); 369 connect(funcComma, SIGNAL(activated()), this, SLOT(slotFuncOutput()));
370} 370}
@@ -600,7 +600,7 @@ void MainWindow::initFunctionsToolbar()
600 funcComma->addTo(toolbarFunctions); 600 funcComma->addTo(toolbarFunctions);
601 601
602 toolFunction=new QToolButton(toolbarFunctions); 602 toolFunction=new QToolButton(toolbarFunctions);
603 toolFunction->setPixmap(Resource::loadPixmap( "opie-sheet/func_func" )); 603 toolFunction->setPixmap(Resource::loadPixmap( "opie-sheet/func-func" ));
604 toolFunction->setTextLabel(tr("Functions")); 604 toolFunction->setTextLabel(tr("Functions"));
605 toolFunction->setPopup(submenuFunc); 605 toolFunction->setPopup(submenuFunc);
606 toolFunction->setPopupDelay(0); 606 toolFunction->setPopupDelay(0);