Skip to content

Commit

Permalink
Renderer properties: switched from list widget to a combo box with re…
Browse files Browse the repository at this point in the history 
…nderers

git-svn-id: http://svn.osgeo.org/qgis/branches/symbology-ng-branch@12134 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
wonder committed Nov 15, 2009
1 parent 6ffdd1a commit 15c7901
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 46 deletions.
17 changes: 9 additions & 8 deletions src/gui/symbology-ng/qgsrendererv2propertiesdialog.cpp
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -51,10 +51,11 @@ QgsRendererV2PropertiesDialog::QgsRendererV2PropertiesDialog(QgsVectorLayer* lay
if (!pix.load(iconPath, "png")) if (!pix.load(iconPath, "png"))
pix = QPixmap(); pix = QPixmap();


QListWidgetItem* item = new QListWidgetItem(QIcon(pix), m.visibleName(), listRenderers); cboRenderers->addItem(QIcon(pix), m.visibleName(), name);
item->setData(Qt::UserRole, name);
} }


cboRenderers->setCurrentIndex(-1); // set no current renderer

// if the layer doesn't use renderer V2, let's start using it! // if the layer doesn't use renderer V2, let's start using it!
if (!mLayer->isUsingRendererV2()) if (!mLayer->isUsingRendererV2())
{ {
Expand All @@ -63,15 +64,15 @@ QgsRendererV2PropertiesDialog::QgsRendererV2PropertiesDialog(QgsVectorLayer* lay
} }


// setup slot rendererChanged() // setup slot rendererChanged()
connect(listRenderers, SIGNAL(currentItemChanged(QListWidgetItem*, QListWidgetItem*)), this, SLOT(rendererChanged())); connect(cboRenderers, SIGNAL(currentIndexChanged(int)), this, SLOT(rendererChanged()));


// set current renderer from layer // set current renderer from layer
QString rendererName = mLayer->rendererV2()->type(); QString rendererName = mLayer->rendererV2()->type();
for (int i = 0; i < listRenderers->count(); i++) for (int i = 0; i < cboRenderers->count(); i++)
{ {
if (listRenderers->item(i)->data(Qt::UserRole).toString() == rendererName) if (cboRenderers->itemData(i).toString() == rendererName)
{ {
listRenderers->setCurrentItem( listRenderers->item(i) ); cboRenderers->setCurrentIndex(i);
return; return;
} }
} }
Expand All @@ -85,13 +86,13 @@ QgsRendererV2PropertiesDialog::QgsRendererV2PropertiesDialog(QgsVectorLayer* lay
void QgsRendererV2PropertiesDialog::rendererChanged() void QgsRendererV2PropertiesDialog::rendererChanged()
{ {


if (listRenderers->currentItem() == NULL) if (cboRenderers->currentIndex() == -1)
{ {
QgsDebugMsg("No current item -- this should never happen!"); QgsDebugMsg("No current item -- this should never happen!");
return; return;
} }


QString rendererName = listRenderers->currentItem()->data(Qt::UserRole).toString(); QString rendererName = cboRenderers->itemData( cboRenderers->currentIndex() ).toString();


// get rid of old active widget (if any) // get rid of old active widget (if any)
if (mActiveWidget) if (mActiveWidget)
Expand Down
75 changes: 37 additions & 38 deletions src/ui/qgsrendererv2propsdialogbase.ui
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -13,36 +13,42 @@
<property name="windowTitle"> <property name="windowTitle">
<string>Renderer settings</string> <string>Renderer settings</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QVBoxLayout" name="verticalLayout_2">
<item row="0" column="0"> <item>
<widget class="QListWidget" name="listRenderers"> <layout class="QHBoxLayout" name="horizontalLayout">
<property name="sizePolicy"> <item>
<sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <widget class="QLabel" name="label_2">
<horstretch>1</horstretch> <property name="text">
<verstretch>0</verstretch> <string>Renderer:</string>
</sizepolicy> </property>
</property> </widget>
<property name="editTriggers"> </item>
<set>QAbstractItemView::NoEditTriggers</set> <item>
</property> <widget class="QComboBox" name="cboRenderers"/>
<property name="showDropIndicator" stdset="0"> </item>
<bool>false</bool> <item>
</property> <spacer name="horizontalSpacer">
<property name="iconSize"> <property name="orientation">
<size> <enum>Qt::Horizontal</enum>
<width>48</width> </property>
<height>48</height> <property name="sizeHint" stdset="0">
</size> <size>
</property> <width>40</width>
<property name="spacing"> <height>20</height>
<number>4</number> </size>
</property> </property>
<property name="viewMode"> </spacer>
<enum>QListView::IconMode</enum> </item>
</property> <item>
</widget> <widget class="QPushButton" name="btnSymbolLevels">
<property name="text">
<string>Symbol levels</string>
</property>
</widget>
</item>
</layout>
</item> </item>
<item row="0" column="1" rowspan="2"> <item>
<widget class="QStackedWidget" name="stackedWidget"> <widget class="QStackedWidget" name="stackedWidget">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred"> <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
Expand All @@ -69,24 +75,17 @@
</widget> </widget>
</widget> </widget>
</item> </item>
<item row="2" column="0" colspan="2"> <item>
<widget class="QDialogButtonBox" name="buttonBox"> <widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons"> <property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0">
<widget class="QPushButton" name="btnSymbolLevels">
<property name="text">
<string>Symbol levels</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<tabstops> <tabstops>
<tabstop>listRenderers</tabstop> <tabstop>cboRenderers</tabstop>
<tabstop>btnSymbolLevels</tabstop> <tabstop>btnSymbolLevels</tabstop>
<tabstop>buttonBox</tabstop> <tabstop>buttonBox</tabstop>
</tabstops> </tabstops>
Expand Down

0 comments on commit 15c7901

Please sign in to comment.