3 files changed, 32 insertions, 3 deletions

diff --git a/noncore/apps/tableviewer/main.cpp b/noncore/apps/tableviewer/main.cpp
index 56c567f..d17ee65 100644
--- a/noncore/apps/tableviewer/main.cpp
+++ b/noncore/apps/tableviewer/main.cpp
@@ -1,32 +1,32 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #include "tableviewer.h"
 #include <qpe/qpeapplication.h>
 
 int main( int argc, char ** argv )
 {
     QPEApplication a( argc, argv );
 
-    TableViewerWindow * mw = new TableViewerWindow;
-    mw->setCaption( TableViewerWindow::tr("Table Viewer") );
-    a.showMainWidget(mw);
+    TableViewerWindow mw;
+    mw.setCaption( TableViewerWindow::tr("Table Viewer") );
+    a.showMainWidget(&mw);
 
     return a.exec();
 }
diff --git a/noncore/apps/tableviewer/tableviewer.cpp b/noncore/apps/tableviewer/tableviewer.cpp
index 0456b41..fbb5c24 100644
--- a/noncore/apps/tableviewer/tableviewer.cpp
+++ b/noncore/apps/tableviewer/tableviewer.cpp
@@ -1,100 +1,101 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/ 
 
 /* local includes */
 #include "tableviewer.h"
 #include "ui/tvbrowseview.h"
 #include "ui/tvfilterview.h"
 #include "ui/tvlistview.h"
 #include "ui/tveditview.h"
 #include "ui/tvkeyedit.h"
 #include "db/datacache.h"
 
 /* QPE includes */
 #include <qpe/fileselector.h>
 #include <qpe/resource.h>
 #include <qpe/qpetoolbar.h>
 
 /* QTE includes */
 #include <qpe/qpemenubar.h>
+#include <qpe/qpetoolbar.h>
 #include <qpopupmenu.h>
 #include <qapplication.h>
 #include <qwidgetstack.h>
 #include <qlayout.h>
 #include <qbuffer.h>
 /*!
     \class TableViewerWindow
     \brief The main window widget of the application
 
     This is the main widget of the table viewer application.  
     It is the co-ordination point.
 */
 
 /*!
     Constructs a new TableViewerWindow
 */
 TableViewerWindow::TableViewerWindow(QWidget *parent, const char *name, WFlags f)
     : QMainWindow(parent, name, f)
 {
     setCaption(tr("Table Viewer"));
 
 /* Build data */
     ds = new DBStore();
     doc.setType("text/x-xml-tableviewer");
     doc.setName("table");
 
     dirty = FALSE;
     ts.current_column = 0;
     ts.kRep = ds->getKeys();
 
 /* build menus */
     menu = new QPEMenuBar(this, 0);
 
     QPopupMenu *file_menu = new QPopupMenu;
     file_menu->insertItem("New", this, SLOT(newDocument()));
 
     file_menu->insertItem("Open", this, SLOT(selectDocument()));
     file_menu->insertSeparator();
     file_menu->insertItem("Properties");
 
     /* later will want to set this up to clean up first via this, SLOT(quit) */
     menu->insertItem("Document", file_menu); 
 
     QPopupMenu *edit_menu = new QPopupMenu;
     edit_menu->insertItem("Edit Item", this, SLOT(editItemSlot()));
     edit_menu->insertItem("Edit Keys", this, SLOT(editKeysSlot()));
     edit_menu->insertItem("Edit filters", this, SLOT(filterViewSlot()));
     menu->insertItem("Edit", edit_menu);
 
     QPopupMenu *view_menu = new QPopupMenu;
     view_menu->insertItem("Browse View", this, SLOT(browseViewSlot()));
     view_menu->insertItem("List View", this, SLOT(listViewSlot()));
     menu->insertItem("View", view_menu); 
 
     QVBoxLayout *main_layout = new QVBoxLayout;
 
     /* Build tool bar */
     navigation = new QPEToolBar(this, "navigation");
     QToolButton *newItemButton = new QToolButton(
       QIconSet(Resource::loadPixmap("new")), "New Item", QString::null,
       this, SLOT(newItemSlot()), navigation, "New Item");
     QToolButton *editItemButton = new QToolButton(
       QIconSet(Resource::loadPixmap("edit")), "Edit Item", QString::null,
       this, SLOT(editItemSlot()), navigation, "Edit Item");
@@ -173,183 +174,208 @@ TableViewerWindow::TableViewerWindow(QWidget *parent, const char *name, WFlags f
 
 /*!
     Destroys the TableViewerWindow
 */
 TableViewerWindow::~TableViewerWindow()
 {
     if(dirty)
       saveDocument();
 }
 
 /*!
     Opens a file dialog and loads the file specified by the dialog
 */
 void TableViewerWindow::selectDocument()
 {
     if(dirty)
   saveDocument();
     current_view = FileState;
     cw->raiseWidget(current_view);
     fileSelector->reread();
 }
 
 void TableViewerWindow::saveDocument()
 {
     if(!dirty)
   return;
 
     FileManager fm;
     QIODevice *dev = fm.saveFile(doc);
 
     if(!ds->saveSource(dev, doc.type())){
   qWarning("Save unsuccessful");
   return;
     }
     dev->close();
     dirty = FALSE;
 }
 
 void TableViewerWindow::newDocument()
 {
     DocLnk nf;
     nf.setType("text/x-xml-tableviewer");
     nf.setName("table");
    
     delete ds;
     ds = new DBStore();
    
     ts.current_column = 0;
     ts.kRep = ds->getKeys();
     browseView->reset();
     listView->reset();
     filterView->reset();
 
     doc = nf;
     dirty = FALSE;
 
     current_view = BrowseState;
     cw->raiseWidget(current_view);
 
   /* now set up for editing the keys */
   ts.kRep->addKey("key", TVVariant::String);
   editKeysSlot();
 }
 
+void TableViewerWindow::setDocument(const QString &f)
+{
+    openDocument(DocLnk(f, TRUE));
+}
+
 void TableViewerWindow::openDocument(const DocLnk &f)
 {
 
     if (!f.isValid()) 
   return;
 
     FileManager fm;
     QIODevice *dev = fm.openFile(f);
     doc = f;
 
     if(ds->openSource(dev, doc.type())) {
         DataElem *d;
 
         browseView->reset();
         listView->reset();
         filterView->reset();
 
   current_view = BrowseState;
   cw->raiseWidget(current_view);
 
         /* set up new table state and ensure sub widgets have a reference */
         ts.current_column = 0;
         ts.kRep = ds->getKeys();
         browseView->rebuildKeys();
         listView->rebuildKeys();
         filterView->rebuildKeys();
 
         ds->first();
         /* set up the list view */
         listView->clearItems();
         do {
             d = ds->getCurrentData();
             if(d) 
                 listView->addItem(d);
         } while(ds->next());
 
         /* Set up browse view, Will be based of structure of listView */
         listView->first();
         ts.current_elem = listView->getCurrentData();
         browseView->rebuildData();
         listView->rebuildData();
 
         QString scratch = "Table Viewer";/* later take from constant */
         scratch += " - ";
         scratch += ds->getName();
         setCaption(tr(scratch));
 
   dirty = FALSE;
     } else {
         qWarning(tr("could not load Document"));
     }
     dev->close();
 }
 
 /*! 
+    Moves to the first item of the current table 
+*/
+void TableViewerWindow::firstItem()
+{
+    listView->first();
+    ts.current_elem = listView->getCurrentData();
+    browseView->rebuildData();
+}
+
+/*! 
+    Moves to the lat item of the current table 
+*/
+void TableViewerWindow::lastItem()
+{
+    listView->last();
+    ts.current_elem = listView->getCurrentData();
+    browseView->rebuildData();
+}
+
+/*! 
     Moves to the next item of the current table 
 */
 void TableViewerWindow::nextItem()
 {
     listView->next();
     ts.current_elem = listView->getCurrentData();
     browseView->rebuildData();
 }
 
 /*! 
     Moves to the previous item of the current table 
 */
 void TableViewerWindow::previousItem()
 {
     listView->previous();
     ts.current_elem = listView->getCurrentData();
     browseView->rebuildData();
 }
 
 /*!
     Raises the List View.  This is a mode change for the application.
 */
 void TableViewerWindow::listViewSlot()
 {
     if(current_view == FilterState)
         applyFilter();
     current_view = ListState;
     cw->raiseWidget(current_view);
 }
 
 void TableViewerWindow::applyFilter()
 {
     DataElem *d;
 
     listView->clearItems();
     ds->first();
     do {
         d = ds->getCurrentData();
         if(d) 
             if(filterView->passesFilter(d))
     listView->addItem(d);
     } while(ds->next());
     listView->first();
     listView->rebuildData();
 }
 
 /*!
     Raises the Browse View.  This is a mode change for the application.
 */
 void TableViewerWindow::browseViewSlot()
 {
     if(current_view == FilterState)
         applyFilter();
 
     ts.current_elem = listView->getCurrentData();
     browseView->rebuildData();
 
     current_view = BrowseState;
     cw->raiseWidget(current_view);
 }
 
 /*!
     Raises the List View.  This is a mode change for the application.
 */
diff --git a/noncore/apps/tableviewer/tableviewer.h b/noncore/apps/tableviewer/tableviewer.h
index 0d3c39d..817db21 100644
--- a/noncore/apps/tableviewer/tableviewer.h
+++ b/noncore/apps/tableviewer/tableviewer.h
@@ -1,109 +1,112 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #ifndef Tableviewer_H
 #define Tableviewer_H
 
 #include <qmainwindow.h>
 #include "db/common.h"
 #include <qpe/fileselector.h>
 
 /* Forward class declarations */
 class QWidgetStack;
 class QDialog;
 class QMenuBar;
 
 class TVListView;
 class TVBrowseView;
 class TVFilterView;
 class TVEditView;
 
 class DBStore;
 
 class TableViewerWindow: public QMainWindow
 {
     Q_OBJECT
 public:
     TableViewerWindow( QWidget *parent = 0, 
                         const char *name = 0, WFlags f = 0 );
     ~TableViewerWindow();
 
 public slots:
     void selectDocument();
 
     void newDocument();
     void saveDocument();
+    void setDocument(const QString &);
     void openDocument(const DocLnk &);
 
+    void firstItem();
+    void lastItem();
     void nextItem();
     void previousItem();
 
     void listViewSlot();
     void browseViewSlot();
     void filterViewSlot();
 
     void editItemSlot();
     void newItemSlot();
     void deleteItemSlot();
 
     void editKeysSlot();
 
     /* reveiw the sig. for this function TODO */
     void searchOnKey(int, TVVariant);
     void setPrimaryKey(int);
 
 /* TODO add new event */
 protected:
 
 /* TODO add new slots */
 private slots:
 
 /* TODO add other widgets used here */
 private:
     bool dirty;
 
     QMenuBar *menu;
     QToolBar *navigation;
 
     TVListView *listView;
     TVBrowseView *browseView;
     TVFilterView *filterView;
     TVEditView *editView;
     FileSelector *fileSelector;
 
     DocLnk doc;
 
     QWidgetStack *cw;
     DBStore *ds;
     TableState ts; /* not a pointer.. this class keeps the state */
 
     enum UserState {
         BrowseState = 0,
         ListState,
         FilterState,
         EditState,
   FileState,
     };
 
     UserState current_view;
 
     void applyFilter();
 };
 
 #endif