Enable icons visibility in Evis dialogs (#4012)

- Add + and - icons - Also move some "what's this" comments to "tooltip"
qgis · Jan 19, 2017 · f43dc8e · f43dc8e
1 parent d0a4697
commit f43dc8e
Show file tree

Hide file tree

Showing 4 changed files with 341 additions and 342 deletions.
diff --git a/src/plugins/evis/eventbrowser/evisgenericeventbrowsergui.cpp b/src/plugins/evis/eventbrowser/evisgenericeventbrowsergui.cpp
@@ -180,23 +180,13 @@ bool eVisGenericEventBrowserGui::initBrowser()
 
   chkboxUseOnlyFilename->setChecked( false );
 
-  QString myThemePath = QgsApplication::activeThemePath();
-  pbtnResetEventImagePathData->setIcon( QIcon( QPixmap( myThemePath + "/mActionDraw.svg" ) ) );
-  pbtnResetCompassBearingData->setIcon( QIcon( QPixmap( myThemePath + "/mActionDraw.svg" ) ) );
-  pbtnResetCompassOffsetData->setIcon( QIcon( QPixmap( myThemePath + "/mActionDraw.svg" ) ) );
-  pbtnResetBasePathData->setIcon( QIcon( QPixmap( myThemePath + "/mActionDraw.svg" ) ) );
-  pbtnResetUseOnlyFilenameData->setIcon( QIcon( QPixmap( myThemePath + "/mActionDraw.svg" ) ) );
-  pbtnResetApplyPathRulesToDocs->setIcon( QIcon( QPixmap( myThemePath + "/mActionDraw.svg" ) ) );
 
   chkboxSaveEventImagePathData->setChecked( false );
   chkboxSaveCompassBearingData->setChecked( false );
   chkboxSaveCompassOffsetData->setChecked( false );
   chkboxSaveBasePathData->setChecked( false );
   chkboxSaveUseOnlyFilenameData->setChecked( false );
 
-  //Set up Configure External Application buttons
-  pbtnAddFileType->setIcon( QIcon( QPixmap( myThemePath + "/mActionNewAttribute.svg" ) ) );
-  pbtnDeleteFileType->setIcon( QIcon( QPixmap( myThemePath + "/mActionDeleteAttribute.svg" ) ) );
 
   //Check to for interface, not null when launched from plugin toolbar, otherwise expect map canvas
   if ( mInterface )

diff --git a/src/plugins/evis/eventbrowser/evisimagedisplaywidget.cpp b/src/plugins/evis/eventbrowser/evisimagedisplaywidget.cpp
@@ -52,7 +52,7 @@ eVisImageDisplayWidget::eVisImageDisplayWidget( QWidget* parent, Qt::WindowFlags
   pbtnZoomIn->setEnabled( false );
   pbtnZoomOut->setEnabled( false );
   pbtnZoomFull->setEnabled( false );
-  QString myThemePath = QgsApplication::activeThemePath();
+  QString myThemePath = QgsApplication::defaultThemePath();
   pbtnZoomIn->setToolTip( tr( "Zoom in" ) );
   pbtnZoomIn->setWhatsThis( tr( "Zoom in to see more detail." ) );
   pbtnZoomOut->setToolTip( tr( "Zoom out" ) );

diff --git a/src/plugins/evis/ui/evisdatabaseconnectionguibase.ui b/src/plugins/evis/ui/evisdatabaseconnectionguibase.ui
@@ -72,7 +72,7 @@
          </property>
          <property name="icon" >
           <iconset>
-           <normaloff>../../../images/themes/default/mActionFolder.svg</normaloff>../../../images/themes/default/mActionFolder.svg</iconset>
+           <normaloff>:/images/themes/default/mActionFolder.svg</normaloff>:/images/themes/default/mActionFolder.svg</iconset>
          </property>
         </widget>
        </item>
@@ -331,7 +331,7 @@ p, li { white-space: pre-wrap; }
          </property>
          <property name="icon" >
           <iconset>
-           <normaloff>../../../images/themes/default/mActionFolder.svg</normaloff>../../../images/themes/default/mActionFolder.svg</iconset>
+           <normaloff>:/images/themes/default/mActionFolder.svg</normaloff>:/images/themes/default/mActionFolder.svg</iconset>
          </property>
         </widget>
        </item>
@@ -506,6 +506,7 @@ p, li { white-space: pre-wrap; }
  </tabstops>
  <resources>
   <include location="../resources/evis.qrc" />
+  <include location="../../../../images/images.qrc"/>
  </resources>
  <connections/>
 </ui>