Skip to content

Commit 4e7c0b5

Browse files
David Gossowhershwg
David Gossow
authored andcommittedOct 11, 2012
added icons to all panels
1 parent 5501540 commit 4e7c0b5

10 files changed

+1671
-4
lines changed
 

‎icons/classes/Displays.svg

+437
Loading

‎icons/classes/Help.svg

+388
Loading

‎icons/classes/Selection.png

403 Bytes
Loading

‎icons/classes/Time.svg

+400
Loading

‎icons/classes/Tool Properties.png

611 Bytes
Loading

‎icons/classes/Views.svg

+425
Loading

‎icons/options.png

-23 Bytes
Loading

‎src/rviz/panel_dock_widget.cpp

+13-2
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,10 @@ PanelDockWidget::PanelDockWidget( const QString& name )
5959
connect( close_button, SIGNAL( clicked() ), this, SLOT(close()) );
6060

6161
QLabel *title_label = new QLabel( name, this );
62-
icon_label_ = new QLabel( "", this );
62+
63+
icon_label_ = new QLabel( this );
64+
icon_label_->setContentsMargins(2,2,0,0);
65+
setIcon( QIcon() );
6366

6467
QHBoxLayout *title_layout = new QHBoxLayout();
6568
title_layout->setContentsMargins(2,2,2,2);
@@ -72,7 +75,15 @@ PanelDockWidget::PanelDockWidget( const QString& name )
7275

7376
void PanelDockWidget::setIcon( QIcon icon )
7477
{
75-
icon_label_->setPixmap( icon.pixmap(16,16) );
78+
if ( icon.isNull() )
79+
{
80+
icon_label_->setVisible( false );
81+
}
82+
else
83+
{
84+
icon_label_->setVisible( true );
85+
icon_label_->setPixmap( icon.pixmap(16,16) );
86+
}
7687
}
7788

7889
void PanelDockWidget::setCollapsed( bool collapsed )

‎src/rviz/pluginlib_factory.h

+6-2
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,14 @@ class PluginlibFactory: public ClassIdRecordingFactory<Type>
117117
{
118118
QString package = getClassPackage( class_id );
119119
QString class_name = getClassName( class_id );
120-
QIcon icon = loadPixmap( "package://"+package+"/icons/classes/"+class_name+".png" );
120+
QIcon icon = loadPixmap( "package://"+package+"/icons/classes/"+class_name+".svg" );
121121
if ( icon.isNull() )
122122
{
123-
icon = loadPixmap( "package://rviz/icons/default_class_icon.png");
123+
icon = loadPixmap( "package://"+package+"/icons/classes/"+class_name+".png" );
124+
if ( icon.isNull() )
125+
{
126+
icon = loadPixmap( "package://rviz/icons/default_class_icon.png");
127+
}
124128
}
125129
return icon;
126130
}

‎src/rviz/visualization_frame.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -1151,6 +1151,8 @@ QDockWidget* VisualizationFrame::addPanelByName( const QString& name,
11511151

11521152
record.panel->initialize( manager_ );
11531153

1154+
record.dock->setIcon( panel_factory_->getIcon( class_id ) );
1155+
11541156
return record.dock;
11551157
}
11561158

0 commit comments

Comments
 (0)
Please sign in to comment.