1 files changed, 21 insertions, 35 deletions

diff --git a/noncore/apps/opie-sheet/mainwindow.cpp b/noncore/apps/opie-sheet/mainwindow.cpp
index b9f8e57..43e5131 100644
--- a/noncore/apps/opie-sheet/mainwindow.cpp
+++ b/noncore/apps/opie-sheet/mainwindow.cpp
@@ -7,39 +7,36 @@
  *                                                                         *
  ***************************************************************************/
 
 /*
  * Opie Sheet (formerly Sheet/Qt)
  * by Serdar Ozler <sozler@sitebest.com>
  */
 
 #include "mainwindow.h"
 
 #include <qpe/filemanager.h>
 #include <qpe/qcopenvelope_qws.h>
+#include <qpe/resource.h>
 #include <qmessagebox.h>
 #include <qfile.h>
+#include <qtranslator.h>
 #include <qradiobutton.h>
 #include "cellformat.h"
 #include "numberdlg.h"
 #include "textdlg.h"
 #include "sortdlg.h"
 #include "finddlg.h"
 
-#include "file-new.xpm"
-#include "file-open.xpm"
-#include "file-save.xpm"
-#include "edit-cancel.xpm"
-#include "edit-accept.xpm"
-#include "help-general.xpm"
+
 #include "func-plus.xpm"
 #include "func-minus.xpm"
 #include "func-cross.xpm"
 #include "func-divide.xpm"
 #include "func-paran-open.xpm"
 #include "func-paran-close.xpm"
 #include "func-comma.xpm"
 #include "func-func.xpm"
 #include "func-equal.xpm"
 #include "cell-select.xpm"
 
 #define DEFAULT_NUM_ROWS 199
@@ -256,43 +253,43 @@ void MainWindow::slotFileOpen()
 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"), QPixmap(file_new_xpm), tr("&New"), 0, this);
+  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"), QPixmap(file_open_xpm), tr("&Open"), 0, this);
+  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"), QPixmap(file_save_xpm), tr("&Save"), 0, this);
+  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"), QPixmap(file_save_xpm), tr("Save &As"), 0, this);
+  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()));
+  //fileQuit=new QAction(tr("Quit"), tr("&Quit"), 0, this);
+  //connect(fileQuit, SIGNAL(activated()), this, SLOT(close()));
 
-  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()));
+  // 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"), QPixmap(edit_accept_xpm), tr("&Accept"), 0, this);
+  editAccept=new QAction(tr("Accept"),Resource::loadPixmap( "enter" ) , tr("&Accept"), 0, this);
   connect(editAccept, SIGNAL(activated()), this, SLOT(slotEditAccept()));
-  editCancel=new QAction(tr("Cancel"), QPixmap(edit_cancel_xpm), tr("&Cancel"), 0, this);
+  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"), QPixmap(cell_select_xpm), 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);
 
@@ -362,26 +359,26 @@ void MainWindow::initActions()
   connect(funcComma, SIGNAL(activated()), this, SLOT(slotFuncOutput()));
 }
 
 void MainWindow::initMenu()
 {
   menu=new QPEMenuBar(this);
 
   menuFile=new QPopupMenu;
   fileNew->addTo(menuFile);
   fileOpen->addTo(menuFile);
   fileSave->addTo(menuFile);
   fileSaveAs->addTo(menuFile);
-  menuFile->insertSeparator();
-  fileQuit->addTo(menuFile);
+//  menuFile->insertSeparator();
+//  fileQuit->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);
@@ -390,28 +387,28 @@ void MainWindow::initMenu()
   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);
+//  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);
@@ -508,35 +505,24 @@ void MainWindow::initEditToolbar()
   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::slotHelpGeneral()
-{
-  if (QFile::exists(helpFile))
-  {
-    QCopEnvelope e("QPE/Application/helpbrowser", "showFile(QString)");
-    e << helpFile;
-  }
-  else
-    QMessageBox::critical(this, tr("Error"), tr("Help file not found!"));
-}
-
 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();
 }