Commit 2ac7655c authored by Ian Humphrey's avatar Ian Humphrey
Browse files

PROG Removed embedded icons from cneteditor and qnet. References #1041. 

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/trunk@6390 41f8697f-d340-4b68-9986-7bafba869bb8
parent dde0a9a6

isis/src/qisis/apps/cneteditor/CnetEditorWindow.cpp

+12 −6
Original line number Diff line number Diff line
@@ -207,26 +207,31 @@ namespace Isis { 




  void CnetEditorWindow::createActions() {

    openNetAct = new QAction(QIcon(":open"), tr("&Open control network"), this);

    openNetAct = new QAction(QIcon(FileName("$base/icons/fileopen.png").expanded()), 

                             tr("&Open control network"), this);

    openNetAct->setShortcut(tr("Ctrl+O"));

    openNetAct->setStatusTip(tr("Open a control network file"));

    connect(openNetAct, SIGNAL(triggered()), this, SLOT(openNet()));



    openCubeListAct = new QAction(QIcon(":open"), tr("Open cube &list"), this);

    openCubeListAct = new QAction(QIcon(FileName("$base/icons/openList.png").expanded()),  

                                  tr("Open cube &list"), this);

    openCubeListAct->setShortcut(tr("Ctrl+L"));

    openCubeListAct->setStatusTip(tr("Open a cube list file"));

    connect(openCubeListAct, SIGNAL(triggered()), this, SLOT(openCubeList()));



    saveAct = new QAction(QIcon(":save"), tr("&Save"), this);

    saveAct = new QAction(QIcon(FileName("$base/icons/filesave.png").expanded()), 

                          tr("&Save"), this);

    saveAct->setShortcut(tr("Ctrl+S"));

    saveAct->setStatusTip(tr("save changes"));

    connect(saveAct, SIGNAL(triggered()), this, SLOT(save()));



    saveAsAct = new QAction(QIcon(":saveAs"), tr("Save&As"), this);

    saveAsAct = new QAction(QIcon(FileName("$base/icons/filesaveas.png").expanded()),

                            tr("Save&As"), this);

    saveAsAct->setStatusTip(tr("Save control network to specified file"));

    connect(saveAsAct, SIGNAL(triggered()), this, SLOT(saveAs()));



    closeAct = new QAction(QIcon(":close"), tr("&Close"), this);

    closeAct = new QAction(QIcon(FileName("$base/icons/fileclose.png").expanded()),

                           tr("&Close"), this);

    closeAct->setStatusTip(tr("Close control net file"));

    connect(closeAct, SIGNAL(triggered()), this, SLOT(closeNetwork()));
@@ -234,7 +239,8 @@ namespace Isis { 
    aboutAct->setStatusTip(tr("Show cneteditor's about box"));

    connect(aboutAct, SIGNAL(triggered()), this, SLOT(about()));



    quitAct = new QAction(QIcon(":quit"), tr("&Quit"), this);

    quitAct = new QAction(QIcon(FileName("$base/icons/exit.png").expanded()), 

                          tr("&Quit"), this);

    quitAct->setShortcut(tr("Ctrl+Q"));

    quitAct->setStatusTip(tr("Quit cneteditor"));

    connect(quitAct, SIGNAL(triggered()), this, SLOT(close()));

isis/src/qisis/apps/cneteditor/cneteditor.qrc

deleted100644 → 0
+0 −12
Original line number Diff line number Diff line 
<RCC>

  <qresource>

    <file alias="open">icons/open.png</file>

    <file alias="save">icons/save.png</file>

    <file alias="saveAs">icons/saveAs.png</file>

    <file alias="close">icons/close.png</file>

    <file alias="quit">icons/quit.png</file>

    <file alias="add">icons/add.png</file>

    <file alias="sort">icons/sort.png</file>

    <file alias="ice">icons/ice.png</file>

  </qresource>

</RCC>

isis/src/qisis/apps/cneteditor/cneteditor.xml

+3 −0
Original line number Diff line number Diff line
@@ -181,5 +181,8 @@ 
      extremely obvious what the options are, how they work, and why your

      tables are not sorting (when they aren't sorting). Fixes #838.

    </change>

    <change name="Ian Humphrey" date="2015-10-07">

      Updated icons. Fixes #1041.

    </change>

  </history>

</application>

isis/src/qisis/apps/cneteditor/icons/add.png

deleted100644 → 0
−8.94 KiB
Loading image diff...

isis/src/qisis/apps/cneteditor/icons/close.png

deleted100644 → 0
−2.04 KiB
Loading image diff...