Skip to content

Commit

Permalink
Explicitly added icon resources
Browse files Browse the repository at this point in the history
  • Loading branch information
rhaschke committed Jul 8, 2020
1 parent e69e033 commit 85f62d8
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 10 deletions.
9 changes: 5 additions & 4 deletions moveit_ros/visualization/CMakeLists.txt
Expand Up @@ -48,21 +48,22 @@ find_package(Eigen3 REQUIRED)

# Qt Stuff
if(rviz_QT_VERSION VERSION_LESS "5")
find_package(Qt4 ${rviz_QT_VERSION} REQUIRED QtCore QtGui)
include(${QT_USE_FILE})
find_package(Qt4 ${rviz_QT_VERSION} REQUIRED QtCore QtGui)
include(${QT_USE_FILE})
macro(qt_wrap_ui)
qt4_wrap_ui(${ARGN})
endmacro()
else()
find_package(Qt5 ${rviz_QT_VERSION} REQUIRED Core Widgets)
set(QT_LIBRARIES Qt5::Widgets)
find_package(Qt5 ${rviz_QT_VERSION} REQUIRED Core Widgets)
set(QT_LIBRARIES Qt5::Widgets)
macro(qt_wrap_ui)
qt5_wrap_ui(${ARGN})
endmacro()
endif()

set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)
add_definitions(-DQT_NO_KEYWORDS)

catkin_package(
Expand Down
Expand Up @@ -23,6 +23,7 @@ set(SOURCE_FILES
src/motion_planning_display.cpp
src/motion_planning_frame_manipulation.cpp
src/motion_planning_param_widget.cpp
src/icons/icons.qrc
)

set(MOVEIT_LIB_NAME moveit_motion_planning_rviz_plugin)
Expand Down
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -0,0 +1,7 @@
<RCC>
<qresource prefix="/icons">
<file>list-add.png</file>
<file>list-remove.png</file>
<file>edit-clear.png</file>
</qresource>
</RCC>
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Expand Up @@ -1068,8 +1068,8 @@
<string>Add</string>
</property>
<property name="icon">
<iconset theme="list-add">
<normaloff>.</normaloff>.</iconset>
<iconset>
<normaloff>:/icons/list-add.png</normaloff>:/icons/list-add.png</iconset>
</property>
</widget>
</item>
Expand All @@ -1088,8 +1088,8 @@
<string>Del</string>
</property>
<property name="icon">
<iconset theme="list-remove">
<normaloff>.</normaloff>.</iconset>
<iconset>
<normaloff>:/icons/list-remove.png</normaloff>:/icons/list-remove.png</iconset>
</property>
</widget>
</item>
Expand All @@ -1108,8 +1108,8 @@
<string>Clr</string>
</property>
<property name="icon">
<iconset theme="edit-clear">
<normaloff>.</normaloff>.</iconset>
<iconset>
<normaloff>:/icons/edit-clear.png</normaloff>:/icons/edit-clear.png</iconset>
</property>
</widget>
</item>
Expand Down

0 comments on commit 85f62d8

Please sign in to comment.