1 files changed, 11 insertions, 3 deletions

diff --git a/noncore/apps/opie-sheet/mainwindow.h b/noncore/apps/opie-sheet/mainwindow.h
index bd99c36..eacbe36 100644
--- a/noncore/apps/opie-sheet/mainwindow.h
+++ b/noncore/apps/opie-sheet/mainwindow.h
@@ -4,110 +4,118 @@
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 /*
  * Opie Sheet (formerly Sheet/Qt)
  * by Serdar Ozler <sozler@sitebest.com>
  */
 
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
 #include <qpe/applnk.h>
 #include <qpe/fileselector.h>
 #include <qmenubar.h>
 #include <qtoolbar.h>
 #include <qmainwindow.h>
 #include <qaction.h>
 #include <qlineedit.h>
 #include <qbutton.h>
 #include <qcombobox.h>
 #include <qtoolbutton.h>
-
+#include "Excel.h"
 #include "sheet.h"
 
 typedef struct typeSheet
 {
   QString name;
   QList<typeCellData> data;
 };
 
 class MainWindow: public QMainWindow
 {
   Q_OBJECT
 
   // QPE objects
   DocLnk* currentDoc;
   QMenuBar *menu;
   QToolBar *toolbarFunctions, *toolbarEdit, *toolbarStandard;
   FileSelector *fileSelector;
+  FileSelector *ExcelSelector;
 
   // QT objects
   QPopupMenu *menuFile, *menuEdit, *menuInsert, *menuFormat, *menuData, *menuHelp,
-             *submenuFunc, *submenuFuncStd, *submenuFuncMath, *submenuFuncStat,
+             *submenuFunc, *submenuFuncStd, *submenuFuncStandard, *submenuFuncLogic,
+	     *submenuFuncTrig, *submenuFuncString, *submenuFuncScientific, *submenuFuncDistr,
+	     *submenuFuncStat,
              *submenuRow, *submenuCol, *submenuSheet;
-  QAction *fileNew, *fileOpen, *fileSave, *fileSaveAs, *fileQuit, *helpAbout, *editAccept, *editCancel, *formatCells,
+  QAction *fileNew, *fileOpen, *fileSave, *fileSaveAs, *fileExcelImport, *fileQuit, *helpAbout, *editAccept, *editCancel, *formatCells,
           *funcPlus, *funcMinus, *funcCross, *funcDivide, *funcParanOpen, *funcParanClose, *funcComma, *funcEqual,
           *editCut, *editCopy, *editPaste, *editPasteContents, *editClear, *insertCols, *insertRows, *insertSheets, *insertCells,
           *rowHeight, *rowShow, *rowHide, *rowAdjust, *colWidth, *colShow, *colHide, *colAdjust, *sheetRename, *sheetRemove,
           *dataSort, *dataFindReplace, *editCellSelect, *helpGeneral;
   QLineEdit *editData;
   QButton *buttonUp, *buttonDown, *buttonLeft, *buttonRight;
   QComboBox *comboSheets;
   QToolButton *toolFunction;
   QList<typeSheet> listSheets;
   QString helpFile;
 
   // Other objects
   Sheet *sheet;
 
   // Variables
   bool documentModified;
 
   // Private functions
   void initMenu();
   void initActions();
   void initFunctionsToolbar();
   void initEditToolbar();
   void initStandardToolbar();
   void initSheet();
   void addToData(const QString &data);
   int saveCurrentFile(bool ask=TRUE);
   void documentOpen(const DocLnk &lnkDoc);
   void documentSave(DocLnk *lnkDoc);
   void closeEvent(QCloseEvent *e);
   void addFlyAction(const QString &text, const QString &menuText, const QString &tip, QWidget *w);
   typeSheet *createNewSheet();
   typeSheet *findSheet(const QString &name);
 
   private slots:
     void slotFileNew();
     void slotFileOpen();
     void slotFileSave();
     void slotFileSaveAs();
+
+    void slotImportExcel(const DocLnk &lnkDoc);
+    void slotImportExcelOpen();
+    void ExcelSelectorHide();
+
     void slotHelpAbout();
     void slotEditAccept();
     void slotEditCancel();
     void slotEditPaste();
     void slotEditPasteContents();
     void slotFormatCells();
     void slotInsertCells();
     void slotInsertRows();
     void slotInsertCols();
     void slotInsertSheets();
     void slotDataSort();
     void slotDataFindReplace();
     void slotRowHeight();
     void slotRowAdjust();
     void slotRowShow();
     void slotRowHide();
     void slotColumnWidth();
     void slotColumnAdjust();
     void slotColumnShow();
     void slotColumnHide();
     void slotSheetRename();
     void slotSheetRemove();
     void slotFuncOutput();
     void slotCellSelect(bool lock);