Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Backport queued_ltr_backports] Geometry checker missing icon #43549

Merged
merged 4 commits into from
Jun 5, 2021
Merged

[Backport queued_ltr_backports] Geometry checker missing icon #43549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
74b1e14
Fixes missing icon for geometry checker plugin. Fixes #42708
lbartoletti Jun 3, 2021
fd28646
BTW use the svg icon
lbartoletti Jun 3, 2021
0514867
remove the png icon
lbartoletti Jun 3, 2021
23ab740
fix build
lbartoletti Jun 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/plugins/geometry_checker/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ set (geometrychecker_RCCS

QT5_WRAP_UI (geometrychecker_UIS_H ${geometrychecker_UIS})

add_library (geometrycheckerplugin MODULE ${geometrychecker_HDRS} ${geometrychecker_SRCS} ${geometrychecker_RCC_SRCS} ${geometrychecker_UIS_H})
add_library (geometrycheckerplugin MODULE ${geometrychecker_SRCS} ${geometrychecker_RCCS} ${geometrychecker_UIS_H})

include_directories(
${CMAKE_SOURCE_DIR}/src/core
Expand Down
Binary file removed src/plugins/geometry_checker/icons/geometrychecker.png
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion src/plugins/geometry_checker/pluginres.qrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<RCC>
<qresource prefix="/geometrychecker">
<file>icons/geometrychecker.png</file>
<file>icons/geometrychecker.svg</file>
<file>icons/tooltip.png</file>
</qresource>
</RCC>
2 changes: 1 addition & 1 deletion src/plugins/geometry_checker/qgsgeometrycheckerplugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ void QgsGeometryCheckerPlugin::initGui()
{
mDialog = new QgsGeometryCheckerDialog( mIface, mIface->mainWindow() );
mDialog->setWindowModality( Qt::NonModal );
mMenuAction = new QAction( QIcon( ":/geometrychecker/icons/geometrychecker.png" ), QApplication::translate( "QgsGeometryCheckerPlugin", "Check Geometries…" ), this );
mMenuAction = new QAction( QIcon( sPluginIcon ), QApplication::translate( "QgsGeometryCheckerPlugin", "Check Geometries…" ), this );
connect( mMenuAction, &QAction::triggered, mDialog, &QWidget::show );
connect( mMenuAction, &QAction::triggered, mDialog, &QWidget::raise );
mIface->addPluginToVectorMenu( QString(), mMenuAction );
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/geometry_checker/qgsgeometrycheckerplugin.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,6 @@ static const QString sDescription = QApplication::translate( "QgsGeometryChecker
static const QString sCategory = QApplication::translate( "QgsGeometryCheckerPlugin", "Vector" );
static const QString sPluginVersion = QApplication::translate( "QgsGeometryCheckerPlugin", "Version 0.1" );
static const QgisPlugin::PluginType sPluginType = QgisPlugin::UI;
static const QString sPluginIcon = QStringLiteral( ":/geometrychecker/icons/geometrychecker.png" );
static const QString sPluginIcon = QStringLiteral( ":/geometrychecker/icons/geometrychecker.svg" );

#endif // QGS_GEOMETRY_CHECKER_PLUGIN_H