diff --git a/Code/Mantid/Images/images.qrc b/Code/Mantid/Images/images.qrc index 3ae66f64e89e0539890a6d69ceb37465c5b85646..ea165a279b523e88d264589dbbe00c9827656c48 100644 --- a/Code/Mantid/Images/images.qrc +++ b/Code/Mantid/Images/images.qrc @@ -9,9 +9,10 @@ <file>HFIR_logo_small.png</file> <file>ISIS_Logo_Transparent.gif</file> <file>Mantid_Logo_Transparent.png</file> - <file>data_replace.png</file> + <file>data_replace.png</file> + <file>panning.png</file> </qresource> - <qresource prefix="/win"> + <qresource prefix="/win"> <file>folder-remote.png</file> <file>folder.png</file> <file>document.png</file> diff --git a/Code/Mantid/Images/panning.png b/Code/Mantid/Images/panning.png new file mode 100644 index 0000000000000000000000000000000000000000..6b48aa1d092071beec4bc7214a01cc4cecbef555 Binary files /dev/null and b/Code/Mantid/Images/panning.png differ diff --git a/Code/Mantid/MantidPlot/src/ApplicationWindow.cpp b/Code/Mantid/MantidPlot/src/ApplicationWindow.cpp index 66f406c1055857ee25e4bad9f1fd73c80fc3cfc7..d7a514e8f8c9cadab9050b8a07c8271c70a8cf07 100644 --- a/Code/Mantid/MantidPlot/src/ApplicationWindow.cpp +++ b/Code/Mantid/MantidPlot/src/ApplicationWindow.cpp @@ -928,10 +928,9 @@ void ApplicationWindow::initToolBars() btnPointer->setChecked(true); plotTools->addAction(btnPointer); - - actionMagnify->setActionGroup(dataTools); - actionMagnify->setCheckable( true ); - plotTools->addAction(actionMagnify); + actionPanPlot->setActionGroup(dataTools); + actionPanPlot->setCheckable( true ); + plotTools->addAction(actionPanPlot); btnZoomIn = new QAction(tr("&Zoom In"), this); btnZoomIn->setShortcut( tr("Ctrl++") ); @@ -1337,7 +1336,7 @@ void ApplicationWindow::plotDataMenuAboutToShow() plotDataMenu->addAction(btnPointer); plotDataMenu->addAction(btnZoomIn); plotDataMenu->addAction(btnZoomOut); - plotDataMenu->addAction(actionMagnify); + plotDataMenu->addAction(actionPanPlot); plotDataMenu->addAction(actionUnzoom); plotDataMenu->insertSeparator(); plotDataMenu->addAction(btnCursor); @@ -12453,8 +12452,8 @@ void ApplicationWindow::pickDataTool( QAction* action ) drawLine(); else if (action == btnMultiPeakPick) selectMultiPeak(); - else if (action == actionMagnify) - magnify(); + else if (action == actionPanPlot) + panOnPlot(); } void ApplicationWindow::connectSurfacePlot(Graph3D *plot) @@ -13414,8 +13413,8 @@ void ApplicationWindow::createActions() connect(actionreleaseFreeMemory,SIGNAL(triggered()), mantidUI, SLOT(releaseFreeMemory() )); #endif - actionMagnify = new QAction(QIcon(getQPixmap("magnifier_xpm")), tr("Zoom &In/Out and Drag Canvas"), this); - connect(actionMagnify, SIGNAL(activated()), this, SLOT(magnify())); + actionPanPlot = new QAction(QIcon(":/panning.png"), tr("Panning tool"), this); + connect(actionPanPlot, SIGNAL(activated()), this, SLOT(panOnPlot())); actionICatLogin = new QAction("Login",this); actionICatLogin->setToolTip(tr("Catalog Login")); @@ -13915,8 +13914,8 @@ void ApplicationWindow::translateActionsStrings() btnZoomOut->setShortcut(tr("Ctrl+-")); btnZoomOut->setToolTip(tr("Zoom Out")); - actionMagnify->setMenuText(tr("Zoom &In/Out and Drag Canvas")); - actionMagnify->setToolTip(tr("Zoom In (Shift++) or Out (-) and Drag Canvas")); + actionPanPlot->setMenuText(tr("Zoom &In/Out and Drag Canvas")); + actionPanPlot->setToolTip(tr("Panning tool (zoom with mouse wheel)")); btnCursor->setMenuText(tr("&Data Reader")); btnCursor->setShortcut(tr("CTRL+D")); @@ -17625,7 +17624,7 @@ void ApplicationWindow::enablesaveNexus(const QString &wsName) } /* For zooming the selected graph using the drag canvas tool and mouse drag. */ -void ApplicationWindow::magnify() +void ApplicationWindow::panOnPlot() { MultiLayer *plot = dynamic_cast<MultiLayer*>(activeWindow(MultiLayerWindow)); if (!plot) diff --git a/Code/Mantid/MantidPlot/src/ApplicationWindow.h b/Code/Mantid/MantidPlot/src/ApplicationWindow.h index 5fafabf20804636dc4c5c285b590ad0514923a35..cb9e0c735613e4d16c1aaec27ffebd50afe13868 100644 --- a/Code/Mantid/MantidPlot/src/ApplicationWindow.h +++ b/Code/Mantid/MantidPlot/src/ApplicationWindow.h @@ -1167,7 +1167,7 @@ private: void showmantidplotHelp(); /// for zooming the selected graph using mouse drag tool - void magnify(); + void panOnPlot(); /// Handler for ICat login menu void ICatLogin(); @@ -1482,7 +1482,7 @@ private: QAction *wireframe, *hiddenline, *polygon, *filledmesh, *pointstyle, *barstyle, *conestyle, *crossHairStyle; QAction *actionShowUndoStack; QActionGroup *coord, *floorstyle, *grids, *plotstyle, *dataTools; - QAction *actionMagnify; + QAction *actionPanPlot; QAction *actionWaterfallPlot; //mantid log level control