Skip to content

Commit d5b84ed

Browse files
author
mhugent
committed
Disable drag and drop in symbol dialogs, fix for bug #1481
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@11017 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 4bd2f5f commit d5b84ed

4 files changed

+14
-12
lines changed

src/app/composer/qgscomposerpicturewidget.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,7 @@ int QgsComposerPictureWidget::addDirectoryToPreview( const QString& path )
265265
}
266266

267267
QListWidgetItem * listItem = new QListWidgetItem( mPreviewListWidget );
268+
listItem->setFlags( Qt::ItemIsSelectable | Qt::ItemIsEnabled );
268269

269270
if ( fileIsSvg )
270271
{

src/app/qgssinglesymboldialog.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ QgsSingleSymbolDialog::QgsSingleSymbolDialog( QgsVectorLayer * layer, bool disab
7575
mypItem->setText( "" );
7676
//store the symbol offset in the UserData role for later retrieval
7777
mypItem->setData( Qt::UserRole, *it );
78+
mypItem->setFlags( Qt::ItemIsSelectable | Qt::ItemIsEnabled );
7879
if ( layer->geometryType() != QGis::Point )
7980
{
8081
break;

src/ui/qgscomposerpicturewidgetbase.ui

+8-11
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<property name="orientation" >
3737
<enum>Qt::Horizontal</enum>
3838
</property>
39-
<property name="sizeHint" >
39+
<property name="sizeHint" stdset="0" >
4040
<size>
4141
<width>101</width>
4242
<height>20</height>
@@ -85,6 +85,12 @@
8585
<layout class="QGridLayout" >
8686
<item row="0" column="0" >
8787
<widget class="QListWidget" name="mPreviewListWidget" >
88+
<property name="showDropIndicator" stdset="0" >
89+
<bool>false</bool>
90+
</property>
91+
<property name="dragDropMode" >
92+
<enum>QAbstractItemView::NoDragDrop</enum>
93+
</property>
8894
<property name="movement" >
8995
<enum>QListView::Free</enum>
9096
</property>
@@ -116,16 +122,7 @@
116122
<property name="spacing" >
117123
<number>6</number>
118124
</property>
119-
<property name="leftMargin" >
120-
<number>0</number>
121-
</property>
122-
<property name="topMargin" >
123-
<number>0</number>
124-
</property>
125-
<property name="rightMargin" >
126-
<number>0</number>
127-
</property>
128-
<property name="bottomMargin" >
125+
<property name="margin" >
129126
<number>0</number>
130127
</property>
131128
<item>

src/ui/qgssinglesymboldialogbase.ui

+4-1
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,11 @@
7878
<layout class="QGridLayout" >
7979
<item row="0" column="0" colspan="3" >
8080
<widget class="QListWidget" name="lstSymbols" >
81+
<property name="showDropIndicator" stdset="0" >
82+
<bool>false</bool>
83+
</property>
8184
<property name="dragDropMode" >
82-
<enum>QAbstractItemView::DragDrop</enum>
85+
<enum>QAbstractItemView::NoDragDrop</enum>
8386
</property>
8487
<property name="alternatingRowColors" >
8588
<bool>false</bool>

0 commit comments

Comments
 (0)