Skip to content

Commit 7d0afde

Browse files
committed
Update ros-visualization#1 2019/02/07
1 parent 461fee7 commit 7d0afde

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

src/rqt_console/console_widget.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -114,22 +114,22 @@ def update_sort_indicator(logical_index, order):
114114
icon_dir = os.path.join(self._rospack.get_path('rqt_gui'), 'resource', 'icons')
115115
self.add_exclude_button.setIcon(QIcon.fromTheme('list-add', QIcon(QPixmap(os.path.join(icon_dir, 'list-add.png')))))
116116
self.add_highlight_button.setIcon(QIcon.fromTheme('list-add', QIcon(QPixmap(os.path.join(icon_dir, 'list-add.png')))))
117-
self.pause_button.setIcon(QIcon.fromTheme('media-playback-pause', QIcon(QPixmap(os.path.join(icon_dir, 'media-playback-pause.png'))))
117+
self.pause_button.setIcon(QIcon.fromTheme('media-playback-pause', QIcon(QPixmap(os.path.join(icon_dir, 'media-playback-pause.png')))))
118118
if not self.pause_button.icon().isNull():
119119
self.pause_button.setText('')
120-
self.record_button.setIcon(QIcon.fromTheme('media-record', QIcon(QPixmap(os.path.join(icon_dir, 'media-record.png'))))
120+
self.record_button.setIcon(QIcon.fromTheme('media-record', QIcon(QPixmap(os.path.join(icon_dir, 'media-record.png')))))
121121
if not self.record_button.icon().isNull():
122122
self.record_button.setText('')
123-
self.load_button.setIcon(QIcon.fromTheme('document-open', QIcon(QPixmap(os.path.join(icon_dir, 'document-open.png'))))
123+
self.load_button.setIcon(QIcon.fromTheme('document-open', QIcon(QPixmap(os.path.join(icon_dir, 'document-open.png')))))
124124
if not self.load_button.icon().isNull():
125125
self.load_button.setText('')
126-
self.save_button.setIcon(QIcon.fromTheme('document-save', QIcon(QPixmap(os.path.join(icon_dir, 'document-save.png'))))
126+
self.save_button.setIcon(QIcon.fromTheme('document-save', QIcon(QPixmap(os.path.join(icon_dir, 'document-save.png')))))
127127
if not self.save_button.icon().isNull():
128128
self.save_button.setText('')
129-
self.clear_button.setIcon(QIcon.fromTheme('edit-clear', QIcon(QPixmap(os.path.join(icon_dir, 'edit-clear.png'))))
129+
self.clear_button.setIcon(QIcon.fromTheme('edit-clear', QIcon(QPixmap(os.path.join(icon_dir, 'edit-clear.png')))))
130130
if not self.clear_button.icon().isNull():
131131
self.clear_button.setText('')
132-
self.highlight_exclude_button.setIcon(QIcon.fromTheme('format-text-strikethrough', QIcon(QPixmap(os.path.join(icon_dir, 'format-text-strikethrough.png'))))
132+
self.highlight_exclude_button.setIcon(QIcon.fromTheme('format-text-strikethrough', QIcon(QPixmap(os.path.join(icon_dir, 'format-text-strikethrough.png')))))
133133

134134
self.pause_button.clicked[bool].connect(self._handle_pause_clicked)
135135
self.record_button.clicked[bool].connect(self._handle_record_clicked)

src/rqt_console/message_data_model.py

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
3030
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
3131
# POSSIBILITY OF SUCH DAMAGE.
32+
import os
3233
import rospkg
3334

3435
from python_qt_binding.QtCore import QAbstractTableModel, QModelIndex, Qt, qWarning

0 commit comments

Comments
 (0)