Skip to content

Commit

Permalink
more icon path changes
Browse files Browse the repository at this point in the history 
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@4690 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
mhugent committed Jan 15, 2006
1 parent bbc982b commit 2a4f7c3
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 18 deletions.
14 changes: 7 additions & 7 deletions src/legend/qgslegend.cpp
View file
Expand Up @@ -390,17 +390,17 @@ void QgsLegend::handleRightClickEvent(QTreeWidgetItem* item, const QPoint& posit
else if(li->type() == QgsLegendItem::LEGEND_LAYER)
{
theMenu.addAction(tr("&Properties"), this, SLOT(legendLayerShowProperties()));
theMenu.addAction(QIcon(QPixmap(iconsPath+QString("mActionAddAllToOverview.png"))), tr("&Add to overview"), this, SLOT(legendLayerAddToOverview()));
theMenu.addAction(QIcon(QPixmap(iconsPath+QString("mActionRemoveAllFromOverview.png"))), tr("&Remove from overview"), this, SLOT(legendLayerRemoveFromOverview()));
theMenu.addAction(QIcon(QPixmap(iconsPath+QString("mActionRemove.png"))), tr("&Remove"), this, SLOT(legendLayerRemove()));
theMenu.addAction(QIcon(QPixmap(iconsPath+QString("/mActionAddAllToOverview.png"))), tr("&Add to overview"), this, SLOT(legendLayerAddToOverview()));
theMenu.addAction(QIcon(QPixmap(iconsPath+QString("/mActionRemoveAllFromOverview.png"))), tr("&Remove from overview"), this, SLOT(legendLayerRemoveFromOverview()));
theMenu.addAction(QIcon(QPixmap(iconsPath+QString("/mActionRemove.png"))), tr("&Remove"), this, SLOT(legendLayerRemove()));
if(li->parent())
{
theMenu.addAction(tr("&Make to toplevel item"), this, SLOT(makeToTopLevelItem()));
}
}
else if(li->type() == QgsLegendItem::LEGEND_GROUP)
{
theMenu.addAction(QPixmap(iconsPath+QString("mActionRemove.png")), tr("&Remove"), this, SLOT(legendGroupRemove()));
theMenu.addAction(QPixmap(iconsPath+QString("/mActionRemove.png")), tr("&Remove"), this, SLOT(legendGroupRemove()));
}

if(li->type() == QgsLegendItem::LEGEND_LAYER || li->type() == QgsLegendItem::LEGEND_GROUP)
Expand All @@ -411,9 +411,9 @@ void QgsLegend::handleRightClickEvent(QTreeWidgetItem* item, const QPoint& posit

}

theMenu.addAction(QIcon(QPixmap(iconsPath+QString("folder_new.png"))), tr("&Add group"), this, SLOT(addGroup()));
theMenu.addAction(QIcon(QPixmap(iconsPath+QString("mActionExpandTree.png"))), tr("&Expand all"), this, SLOT(expandAll()));
theMenu.addAction(QIcon(QPixmap(iconsPath+QString("mActionCollapseTree.png"))), tr("&Collapse all"), this, SLOT(collapseAll()));
theMenu.addAction(QIcon(QPixmap(iconsPath+QString("/folder_new.png"))), tr("&Add group"), this, SLOT(addGroup()));
theMenu.addAction(QIcon(QPixmap(iconsPath+QString("/mActionExpandTree.png"))), tr("&Expand all"), this, SLOT(expandAll()));
theMenu.addAction(QIcon(QPixmap(iconsPath+QString("/mActionCollapseTree.png"))), tr("&Collapse all"), this, SLOT(collapseAll()));

theMenu.exec(position);
}
Expand Down
6 changes: 3 additions & 3 deletions src/legend/qgslegendgroup.cpp
View file
Expand Up @@ -27,23 +27,23 @@ QgsLegendGroup::QgsLegendGroup(QTreeWidgetItem * theItem ,QString theName)
{
mType=LEGEND_GROUP;
setFlags(Qt::ItemIsEditable | Qt::ItemIsEnabled | Qt::ItemIsSelectable);
QIcon myIcon(QgsApplication::themePath()+"mActionFolder.png");
QIcon myIcon(QgsApplication::themePath()+"/mActionFolder.png");
setIcon(0, myIcon);
}
QgsLegendGroup::QgsLegendGroup(QTreeWidget* theListView, QString theString)
: QgsLegendItem(theListView,theString)
{
mType=LEGEND_GROUP;
setFlags(Qt::ItemIsEditable | Qt::ItemIsEnabled | Qt::ItemIsSelectable);
QIcon myIcon(QgsApplication::themePath()+"mActionFolder.png");
QIcon myIcon(QgsApplication::themePath()+"/mActionFolder.png");
setIcon(0, myIcon);
}

QgsLegendGroup::QgsLegendGroup(QString name): QgsLegendItem()
{
mType=LEGEND_GROUP;
setFlags(Qt::ItemIsEditable | Qt::ItemIsEnabled | Qt::ItemIsSelectable);
QIcon myIcon(QgsApplication::themePath()+"mActionFolder.png");
QIcon myIcon(QgsApplication::themePath()+"/mActionFolder.png");
setText(0, name);
setIcon(0, myIcon);
}
Expand Down
12 changes: 6 additions & 6 deletions src/legend/qgslegendlayerfile.cpp
View file
Expand Up @@ -30,12 +30,12 @@ QgsLegendLayerFile::QgsLegendLayerFile(QTreeWidgetItem * theLegendItem, QString
mType = LEGEND_LAYER_FILE;
QPixmap originalPixmap = getOriginalPixmap();
//ensure the overview glasses is painted if necessary
/*if(mLayer->showInOverviewStatus())
if(mLayer->showInOverviewStatus())
{
QPixmap inOverviewPixmap(QgsApplication::themePath()+...);
QPixmap inOverviewPixmap(QgsApplication::themePath()+"/mActionInOverview.png");
QPainter p(&originalPixmap);
p.drawPixmap(0,0,inOverviewPixmap);
}*/
}
setFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled | Qt::ItemIsSelectable);
QIcon originalIcon(originalPixmap);
setCheckState (0, Qt::Checked );
Expand All @@ -49,12 +49,12 @@ QgsLegendLayerFile::QgsLegendLayerFile(QString theString, QgsMapLayer* theLayer)
mType = LEGEND_LAYER_FILE;
QPixmap originalPixmap = getOriginalPixmap();
//ensure the overview glasses is painted if necessary
/*if(mLayer->showInOverviewStatus())
if(mLayer->showInOverviewStatus())
{
QPixmap inOverviewPixmap(QgsApplication::themePath()+...);
QPixmap inOverviewPixmap(QgsApplication::themePath()+"/mActionInOverview.png");
QPainter p(&originalPixmap);
p.drawPixmap(0,0,inOverviewPixmap);
}*/
}
setFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled | Qt::ItemIsSelectable);
QIcon originalIcon(originalPixmap);
setCheckState (0, Qt::Checked );
Expand Down
2 changes: 1 addition & 1 deletion src/legend/qgslegendpropertygroup.cpp
View file
Expand Up @@ -26,7 +26,7 @@ QgsLegendPropertyGroup::QgsLegendPropertyGroup(QTreeWidgetItem* theLegendItem, Q
: QgsLegendItem(theLegendItem,theString )
{
mType=LEGEND_PROPERTY_GROUP;
QIcon myIcon(QgsApplication::themePath()+"mIconProperties.png");
QIcon myIcon(QgsApplication::themePath()+"/mIconProperties.png");
setText(0, theString);
setIcon(0,myIcon);
}
Expand Down
2 changes: 1 addition & 1 deletion src/legend/qgslegendsymbologygroup.cpp
View file
Expand Up @@ -29,7 +29,7 @@ QgsLegendSymbologyGroup::QgsLegendSymbologyGroup(QTreeWidgetItem * theItem, QStr
: QgsLegendItem( theItem, theString)
{
mType = LEGEND_SYMBOL_GROUP;
QIcon myIcon(QgsApplication::themePath()+"mIconSymbology.png");
QIcon myIcon(QgsApplication::themePath()+"/mIconSymbology.png");
setText(0, theString);
setIcon(0,myIcon);
}
Expand Down

0 comments on commit 2a4f7c3

Please sign in to comment.