Commit 7da88644 authored by Ian Humphrey's avatar Ian Humphrey
Browse files

PROG fixed two icons in cneteditor. References #1041. 

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

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

+3 −0
Original line number Diff line number Diff line
@@ -184,5 +184,8 @@ 
    <change name="Ian Humphrey" date="2015-10-07">

      Updated icons. Fixes #1041.

    </change>

    <change name="Ian Humphrey" date="2015-11-16">

      Fixed a couple missing icons. References #1041.

    </change>

  </history>

</application>

isis/src/qisis/objs/CnetEditorWidget/AbstractFilterSelector.cpp

+2 −1
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <QWriteLocker>



#include "AbstractFilter.h"

#include "FileName.h"

#include "PointIdFilter.h"
@@ -72,7 +73,7 @@ namespace Isis { 


    void AbstractFilterSelector::createSelector() {

      m_closeButton = new QPushButton;

      m_closeButton->setIcon(QIcon(":close"));

      m_closeButton->setIcon(QIcon(FileName("$base/icons/editdelete.png").expanded()));

      connect(m_closeButton, SIGNAL(clicked()), this, SLOT(sendClose()));



      m_selector = new QComboBox;

isis/src/qisis/objs/CnetEditorWidget/AbstractFilterSelector.h

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ namespace Isis { 
     *

     * @internal

     *   @history 2012-09-28 Kimberly Oyama - Changed member variables to be prefixed with "m_".

     *   @history 2015-11-16 Ian Humphrey - Removed embedded close button icon. References #1041.

     */

    class AbstractFilterSelector : public QWidget {

        Q_OBJECT

isis/src/qisis/objs/CnetEditorWidget/FilterGroup.cpp

+2 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 


#include "IException.h"

#include "IString.h"

#include "FileName.h"



#include "AbstractFilterSelector.h"

#include "ImageImageFilterSelector.h"
@@ -142,7 +143,7 @@ namespace Isis { 
      m_logicWidget->setLayout(logicLayout);



      m_newSelectorButton = new QPushButton;

      m_newSelectorButton->setIcon(QIcon(":add"));

      m_newSelectorButton->setIcon(QIcon(FileName("$base/icons/add.png").expanded()));

      QString newSelectorTooltip = "Add new filter";

      m_newSelectorButton->setToolTip(newSelectorTooltip);

      m_newSelectorButton->setStatusTip(newSelectorTooltip);

isis/src/qisis/objs/CnetEditorWidget/FilterGroup.h

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ namespace Isis { 
     *

     * @internal

     *   @history 2012-09-28 Kimberly Oyama - Changed member variables to be prefixed with "m_".

     *   @history 2015-11-16 Ian Humphrey - Removed embedded icons. References #1041.

     */

    class FilterGroup : public QWidget {

        Q_OBJECT