Skip to content

Commit

Permalink
[joins] display if memory cache is used in layer properties dialog
Browse files Browse the repository at this point in the history
  • Loading branch information
3nids committed Mar 18, 2014
1 parent 3094175 commit ab920ba
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 15 deletions.
5 changes: 5 additions & 0 deletions src/app/qgsvectorlayerproperties.cpp
Expand Up @@ -1024,7 +1024,12 @@ void QgsVectorLayerProperties::addJoinToTreeWidget( const QgsVectorJoinInfo& joi
else
joinItem->setText( 2, join.targetFieldName );

if ( join.memoryCache )
joinItem->setText( 3, QString::fromUtf8( "\u2714" ) );

mJoinTreeWidget->addTopLevelItem( joinItem );
for ( int c = 0; c < 3; c++ )
mJoinTreeWidget->resizeColumnToContents( c );
}

void QgsVectorLayerProperties::on_mButtonRemoveJoin_clicked()
Expand Down
35 changes: 20 additions & 15 deletions src/ui/qgsvectorlayerpropertiesbase.ui
Expand Up @@ -266,7 +266,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>739</width>
<width>427</width>
<height>525</height>
</rect>
</property>
Expand Down Expand Up @@ -695,8 +695,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>755</width>
<height>452</height>
<width>100</width>
<height>30</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_18">
Expand Down Expand Up @@ -769,8 +769,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>755</width>
<height>452</height>
<width>121</width>
<height>38</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_28">
Expand Down Expand Up @@ -833,8 +833,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>755</width>
<height>452</height>
<width>100</width>
<height>30</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_20">
Expand Down Expand Up @@ -875,8 +875,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>755</width>
<height>452</height>
<width>702</width>
<height>171</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_32">
Expand Down Expand Up @@ -1018,8 +1018,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>755</width>
<height>452</height>
<width>476</width>
<height>182</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_26">
Expand Down Expand Up @@ -1238,7 +1238,7 @@
<item>
<widget class="QTreeWidget" name="mJoinTreeWidget">
<property name="columnCount">
<number>3</number>
<number>4</number>
</property>
<column>
<property name="text">
Expand All @@ -1255,6 +1255,11 @@
<string>Target field</string>
</property>
</column>
<column>
<property name="text">
<string>Memory cache</string>
</property>
</column>
</widget>
</item>
<item>
Expand Down Expand Up @@ -1320,8 +1325,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>755</width>
<height>452</height>
<width>100</width>
<height>30</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_24">
Expand Down Expand Up @@ -1362,7 +1367,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>739</width>
<width>375</width>
<height>519</height>
</rect>
</property>
Expand Down

0 comments on commit ab920ba

Please sign in to comment.