qt4 update

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@4708 c8812cc2-4d05-0410-92ff-de0c093fc19c

src/plugins/grass/qgsgrassmapcalc.cpp

@@ -36,13 +36,16 @@
 #include <qstatusbar.h>
 #include <qinputdialog.h>
 #include <qdom.h>
-//Added by qt3to4:
+
 #include <QMouseEvent>
 #include <QKeyEvent>
 #include <QGridLayout>
 #include <QTextStream>
+#include <QActionGroup>
+#include <QToolBar>
 
 #include "qgis.h"
+#include "qgsapplication.h"
 #include "qgsmapcanvas.h"
 #include "qgsmaplayer.h"
 #include "qgsvectorlayer.h"
@@ -67,18 +70,17 @@ QgsGrassMapcalc::QgsGrassMapcalc (
            QgsGrassTools *tools, QgsGrassModule *module,
            QgisApp *qgisApp, QgisIface *iface, 
            QWidget * parent, const char * name, Qt::WFlags f )
-       : QgsGrassModuleOptions( tools, module, qgisApp, iface),
-         //QgsGrassMapcalcBase ( parent, name, f ),
-         //Tim removed params during qt4 ui port - FIXME
+       : QMainWindow(0,Qt::WType_Dialog),
+         QgsGrassModuleOptions( tools, module, qgisApp, iface),
          QgsGrassMapcalcBase ( ),
 	 mObject(0), mConnector(0), mTool(-1)
 {
     #ifdef QGISDEBUG
     std::cerr << "QgsGrassMapcalc()" << std::endl;
     #endif
 
-    mActionSave->setEnabled(false);
-    //statusBar()->hide();
+    setupUi(this);
+
     mStartMoveConnectorPoints.resize(2);
     mNextId = 0;
 
@@ -98,12 +100,74 @@ QgsGrassMapcalc::QgsGrassMapcalc (
     mPaper->setActive(false);
     mPaper->show();
 
-    std::cerr << ">>>" << std::endl;
     resizeCanvas( 400, 300 );
-    std::cerr << ">>>" << std::endl;
 
     mView->setCanvas ( mCanvas );
 
+    QString myIconPath = QgsApplication::themePath() + "/grass/";
+
+    QActionGroup *ag = new QActionGroup ( this );
+    QToolBar *tb = addToolBar(tr("Mapcalc tools"));
+
+    mActionAddMap = new QAction( QIcon(myIconPath+"mapcalc_add_map.png"), 
+                        tr("Add map"), this);
+    mActionAddMap->setCheckable ( true );
+    ag->addAction ( mActionAddMap );
+    tb->addAction ( mActionAddMap );
+    connect ( mActionAddMap, SIGNAL(triggered()), this, SLOT(addMap()) );
+
+    mActionAddConstant = new QAction( QIcon(myIconPath+"mapcalc_add_constant.png"), 
+                        tr("Add constant value"), this);
+    mActionAddConstant->setCheckable ( true );
+    ag->addAction ( mActionAddConstant );
+    tb->addAction ( mActionAddConstant );
+    connect ( mActionAddConstant, SIGNAL(triggered()), this, SLOT(addConstant()) );
+
+    mActionAddFunction = new QAction( QIcon(myIconPath+"mapcalc_add_function.png"), 
+                        tr("Add operator or function"), this);
+    mActionAddFunction->setCheckable ( true );
+    ag->addAction ( mActionAddFunction );
+    tb->addAction ( mActionAddFunction );
+    connect ( mActionAddFunction, SIGNAL(triggered()), this, SLOT(addFunction()) );
+
+    mActionAddConnection = new QAction( QIcon(myIconPath+"mapcalc_add_connection.png"), 
+                        tr("Add connection"), this);
+    mActionAddConnection->setCheckable ( true );
+    ag->addAction ( mActionAddConnection );
+    tb->addAction ( mActionAddConnection );
+    connect ( mActionAddConnection, SIGNAL(triggered()), this, SLOT(addConnection()) );
+
+    mActionSelectItem = new QAction( QIcon(myIconPath+"mapcalc_select.png"), 
+                        tr("Select item"), this);
+    mActionSelectItem->setCheckable ( true );
+    ag->addAction ( mActionSelectItem );
+    tb->addAction ( mActionSelectItem );
+    connect ( mActionSelectItem, SIGNAL(triggered()), this, SLOT(selectItem()) );
+
+    mActionDeleteItem = new QAction( QIcon(myIconPath+"mapcalc_delete.png"), 
+                        tr("Delete selected item"), this);
+    mActionDeleteItem->setCheckable ( true );
+    ag->addAction ( mActionDeleteItem );
+    tb->addAction ( mActionDeleteItem );
+    connect ( mActionDeleteItem, SIGNAL(triggered()), this, SLOT(deleteItem()) );
+
+    mActionAddMap->setOn(true);
+
+    mActionLoad = new QAction( QIcon(myIconPath+"mapcalc_open.png"), 
+                        tr("Open"), this);
+    tb->addAction ( mActionLoad );
+    connect ( mActionLoad, SIGNAL(triggered()), this, SLOT(load()) );
+
+    mActionSave = new QAction( QIcon(myIconPath+"mapcalc_save.png"), 
+                        tr("Save"), this);
+    tb->addAction ( mActionSave );
+    connect ( mActionSave, SIGNAL(triggered()), this, SLOT(save()) );
+    mActionSave->setEnabled(false);
+
+    mActionSaveAs = new QAction( QIcon(myIconPath+"mapcalc_save_as.png"), 
+                        tr("Save as"), this);
+    tb->addAction ( mActionSaveAs );
+    connect ( mActionSaveAs, SIGNAL(triggered()), this, SLOT(saveAs()) );
 
     /* Create functions */
     int t = QgsGrassMapcalcFunction::Operator;

src/plugins/grass/qgsgrassmapcalc.h

@@ -1,9 +1,3 @@
-//Added by qt3to4:
-#include <QMouseEvent>
-#include <Q3Frame>
-#include <QKeyEvent>
-#include <QCloseEvent>
-#include <QPixmap>
 /**********************************************************************
                            qgsgrassmapcalc.h 
                              -------------------
@@ -20,6 +14,13 @@
 #ifndef QGSGRASSMAPCALC_H
 #define QGSGRASSMAPCALC_H
 
+#include <QMouseEvent>
+#include <Q3Frame>
+#include <QKeyEvent>
+#include <QCloseEvent>
+#include <QPixmap>
+#include <QAction>
+
 class QCloseEvent;
 class QString;
 class QStringList;
@@ -51,14 +52,14 @@ class QgsGrassMapcalcItem;
 class QgsGrassMapcalcObject;
 class QgsGrassMapcalcConnector;
 #include "ui_qgsgrassmapcalcbase.h"
-#include <QDialog>
 #include "qgsgrassmodule.h"
 
 /*! 
  *  \class QgsGrassMapcalc
  *  \brief Interface for r.mapcalc
  */
-class QgsGrassMapcalc: public QDialog, private Ui::QgsGrassMapcalcBase, public QgsGrassModuleOptions
+class QgsGrassMapcalc: public QMainWindow, private Ui::QgsGrassMapcalcBase, 
+                       public QgsGrassModuleOptions
 {
    Q_OBJECT
 
@@ -138,12 +139,15 @@ public slots:
     void setTool ( int );
 
     //! Map selection changed
+    void on_mMapComboBox_activated() { mapChanged(); }
     void mapChanged();
 
     //! Constant changed
+    void on_mConstantLineEdit_textChanged() { constantChanged(); }
     void constantChanged();
 
     //! Function selection changed
+    void on_mFunctionComboBox_activated() { functionChanged(); }
     void functionChanged();
 
     //! Save current state to file
@@ -205,6 +209,18 @@ public slots:
 
     //! Background
     Q3CanvasRectangle *mPaper;
+
+    // Actions
+    QAction *mActionAddMap;    
+    QAction *mActionAddConstant;    
+    QAction *mActionAddFunction;    
+    QAction *mActionAddConnection;    
+    QAction *mActionSelectItem;    
+    QAction *mActionDeleteItem;    
+
+    QAction *mActionLoad;    
+    QAction *mActionSave;    
+    QAction *mActionSaveAs;    
 };
 
 /*