Skip to content

Commit f43dc8e

Browse files
DelazJnirvn
authored andcommitted
Enable icons visibility in Evis dialogs (#4012)
- Add + and - icons - Also move some "what's this" comments to "tooltip"
1 parent d0a4697 commit f43dc8e

4 files changed

Lines changed: 341 additions & 342 deletions

File tree

‎src/plugins/evis/eventbrowser/evisgenericeventbrowsergui.cpp‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -180,23 +180,13 @@ bool eVisGenericEventBrowserGui::initBrowser()
180180

181181
chkboxUseOnlyFilename->setChecked( false );
182182

183-
QString myThemePath = QgsApplication::activeThemePath();
184-
pbtnResetEventImagePathData->setIcon( QIcon( QPixmap( myThemePath + "/mActionDraw.svg" ) ) );
185-
pbtnResetCompassBearingData->setIcon( QIcon( QPixmap( myThemePath + "/mActionDraw.svg" ) ) );
186-
pbtnResetCompassOffsetData->setIcon( QIcon( QPixmap( myThemePath + "/mActionDraw.svg" ) ) );
187-
pbtnResetBasePathData->setIcon( QIcon( QPixmap( myThemePath + "/mActionDraw.svg" ) ) );
188-
pbtnResetUseOnlyFilenameData->setIcon( QIcon( QPixmap( myThemePath + "/mActionDraw.svg" ) ) );
189-
pbtnResetApplyPathRulesToDocs->setIcon( QIcon( QPixmap( myThemePath + "/mActionDraw.svg" ) ) );
190183

191184
chkboxSaveEventImagePathData->setChecked( false );
192185
chkboxSaveCompassBearingData->setChecked( false );
193186
chkboxSaveCompassOffsetData->setChecked( false );
194187
chkboxSaveBasePathData->setChecked( false );
195188
chkboxSaveUseOnlyFilenameData->setChecked( false );
196189

197-
//Set up Configure External Application buttons
198-
pbtnAddFileType->setIcon( QIcon( QPixmap( myThemePath + "/mActionNewAttribute.svg" ) ) );
199-
pbtnDeleteFileType->setIcon( QIcon( QPixmap( myThemePath + "/mActionDeleteAttribute.svg" ) ) );
200190

201191
//Check to for interface, not null when launched from plugin toolbar, otherwise expect map canvas
202192
if ( mInterface )

‎src/plugins/evis/eventbrowser/evisimagedisplaywidget.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ eVisImageDisplayWidget::eVisImageDisplayWidget( QWidget* parent, Qt::WindowFlags
5252
pbtnZoomIn->setEnabled( false );
5353
pbtnZoomOut->setEnabled( false );
5454
pbtnZoomFull->setEnabled( false );
55-
QString myThemePath = QgsApplication::activeThemePath();
55+
QString myThemePath = QgsApplication::defaultThemePath();
5656
pbtnZoomIn->setToolTip( tr( "Zoom in" ) );
5757
pbtnZoomIn->setWhatsThis( tr( "Zoom in to see more detail." ) );
5858
pbtnZoomOut->setToolTip( tr( "Zoom out" ) );

‎src/plugins/evis/ui/evisdatabaseconnectionguibase.ui‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
</property>
7373
<property name="icon" >
7474
<iconset>
75-
<normaloff>../../../images/themes/default/mActionFolder.svg</normaloff>../../../images/themes/default/mActionFolder.svg</iconset>
75+
<normaloff>:/images/themes/default/mActionFolder.svg</normaloff>:/images/themes/default/mActionFolder.svg</iconset>
7676
</property>
7777
</widget>
7878
</item>
@@ -331,7 +331,7 @@ p, li { white-space: pre-wrap; }
331331
</property>
332332
<property name="icon" >
333333
<iconset>
334-
<normaloff>../../../images/themes/default/mActionFolder.svg</normaloff>../../../images/themes/default/mActionFolder.svg</iconset>
334+
<normaloff>:/images/themes/default/mActionFolder.svg</normaloff>:/images/themes/default/mActionFolder.svg</iconset>
335335
</property>
336336
</widget>
337337
</item>
@@ -506,6 +506,7 @@ p, li { white-space: pre-wrap; }
506506
</tabstops>
507507
<resources>
508508
<include location="../resources/evis.qrc" />
509+
<include location="../../../../images/images.qrc"/>
509510
</resources>
510511
<connections/>
511512
</ui>

0 commit comments

Comments
 (0)