Skip to content

Commit

Permalink
refs #6133. Use new icons.
Browse files Browse the repository at this point in the history
  • Loading branch information
OwenArnold committed Jan 25, 2013
1 parent f512ca1 commit e04ae47
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 4 deletions.
8 changes: 8 additions & 0 deletions Code/Mantid/MantidPlot/icons/icons.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -227,5 +227,13 @@
<file>align_bottom.png</file>
<file>align_left.png</file>
<file>align_right.png</file>
<file>NewProject16x16.png</file>
<file>NewProject32x32.png</file>
<file>LoadProject16x16.png</file>
<file>LoadProject32x32.png</file>
<file>SaveProject16x16.png</file>
<file>SaveProject32x32.png</file>
<file>Open-icon16x16.png</file>
<file>Open-icon32x32.png</file>
</qresource>
</RCC>
8 changes: 4 additions & 4 deletions Code/Mantid/MantidPlot/src/ApplicationWindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12537,11 +12537,11 @@ void ApplicationWindow::createActions()
actionSetupParaview = new QAction(tr("Setup 3D Visualisation"), this);
connect(actionSetupParaview, SIGNAL(activated()), this, SLOT(showSetupParaview()));

actionNewProject = new QAction(QIcon(getQPixmap("new_xpm")), tr("New &Project"), this);
actionNewProject = new QAction(QIcon(":/NewProject16x16.png"), tr("New &Project"), this);
actionNewProject->setShortcut( tr("Ctrl+N") );
connect(actionNewProject, SIGNAL(activated()), this, SLOT(newProject()));

actionSaveProject=new QAction(QIcon(getQPixmap("filesave_xpm")), tr("Save &Project"), this);
actionSaveProject=new QAction(QIcon(":/SaveProject16x16.png"), tr("Save &Project"), this);
actionSaveProject->setShortcut( tr("Ctrl+Shift+S") );
connect(actionSaveProject, SIGNAL(activated()), this, SLOT(saveProject()));

Expand Down Expand Up @@ -12575,11 +12575,11 @@ void ApplicationWindow::createActions()
actionNewSurfacePlot->setShortcut( tr("Ctrl+ALT+Z") );
connect(actionNewSurfacePlot, SIGNAL(activated()), this, SLOT(newSurfacePlot()));

actionOpenProj=new QAction(QIcon(getQPixmap("folder_open_xpm")), tr("&Project"), this);
actionOpenProj=new QAction(QIcon(":/LoadProject16x16.png"), tr("&Project"), this);
actionOpenProj->setShortcut( tr("Ctrl+Shift+O") );
connect(actionOpenProj, SIGNAL(activated()), this, SLOT(open()));

actionLoadFile=new QAction(QIcon(getQPixmap("fileopen_raw_xpm")), tr("Data File"), this);
actionLoadFile=new QAction(QIcon(":/Open-icon16x16.png"), tr("Data File"), this);
actionLoadFile->setShortcut( tr("Ctrl+Shift+F") );
connect(actionLoadFile, SIGNAL(activated()), this, SLOT(loadDataFile()));

Expand Down

0 comments on commit e04ae47

Please sign in to comment.