open on drop

signedav · signedav · commit 7fd8732061d5 · 2018-09-05T11:01:32.000+02:00
diff --git a/src/app/qgsattributesformproperties.cpp b/src/app/qgsattributesformproperties.cpp
@@ -142,7 +142,7 @@ void QgsAttributesFormProperties::initAvailableWidgetsTree()
   DnDTreeItemData itemData = DnDTreeItemData( DnDTreeItemData::QmlWidget, QStringLiteral( "QmlWidget" ), tr( "QML Widget" ) );
   itemData.setShowLabel( true );
 
-  QTreeWidgetItem *item = mAvailableWidgetsTree->addItem( catitem, itemData );
+  mAvailableWidgetsTree->addItem( catitem, itemData );
   catitem ->setExpanded( true );
 }
 
@@ -851,6 +851,10 @@ QTreeWidgetItem *DnDTree::addItem( QTreeWidgetItem *parent, QgsAttributesFormPro
       case QgsAttributesFormProperties::DnDTreeItemData::Container:
         newItem->setIcon( 0, QgsApplication::getThemeIcon( "/mContainerIcon.svg" ) );
         break;
+
+      case QgsAttributesFormProperties::DnDTreeItemData::QmlWidget:
+        newItem->setIcon( 0, QgsApplication::getThemeIcon( "/mQmlWidgetIcon.svg" ) );
+        break;
     }
   }
   newItem->setData( 0, QgsAttributesFormProperties::DnDTreeRole, data );
@@ -914,16 +918,23 @@ bool DnDTree::dropMimeData( QTreeWidgetItem *parent, int index, const QMimeData
     {
       stream >> itemElement;
 
+      QTreeWidgetItem *newItem;
+
       if ( parent )
       {
-        addItem( parent, itemElement, index );
+        newItem = addItem( parent, itemElement, index );
         bDropSuccessful = true;
       }
       else
       {
-        addItem( invisibleRootItem(), itemElement, index );
+        newItem = addItem( invisibleRootItem(), itemElement, index );
         bDropSuccessful = true;
       }
+
+      if ( itemElement.type() == QgsAttributesFormProperties::DnDTreeItemData::QmlWidget )
+      {
+        onItemDoubleClicked( newItem, 0 );
+      }
     }
   }
 
@@ -1094,8 +1105,8 @@ void DnDTree::onItemDoubleClicked( QTreeWidgetItem *item, int column )
     case QgsAttributesFormProperties::DnDTreeItemData::QmlWidget:
     {
       QDialog dlg;
+      dlg.resize( 600, 400 );
       dlg.setWindowTitle( tr( "Configure QML Widget" ) );
-      dlg.setBaseSize( 600, 400 );
       QFormLayout *layout = new QFormLayout() ;
       dlg.setLayout( layout );
       layout->addWidget( baseWidget );
diff --git a/src/app/qgsqmlwidgetconfig.ui b/src/app/qgsqmlwidgetconfig.ui
@@ -0,0 +1,71 @@
+<ui version="4.0" >
+ <author></author>
+ <comment></comment>
+ <exportmacro></exportmacro>
+ <class>Dialog</class>
+ <widget class="QDialog" name="Dialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Dialog</string>
+  </property>
+  <widget class="QDialogButtonBox" name="buttonBox" >
+   <property name="geometry" >
+    <rect>
+     <x>30</x>
+     <y>240</y>
+     <width>341</width>
+     <height>32</height>
+    </rect>
+   </property>
+   <property name="orientation" >
+    <enum>Qt::Horizontal</enum>
+   </property>
+   <property name="standardButtons" >
+    <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+   </property>
+  </widget>
+ </widget>
+ <pixmapfunction></pixmapfunction>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>Dialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>Dialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ void QgsAttributesFormProperties::initAvailableWidgetsTree()`
`142`	`142`	`DnDTreeItemData itemData = DnDTreeItemData( DnDTreeItemData::QmlWidget, QStringLiteral( "QmlWidget" ), tr( "QML Widget" ) );`
`143`	`143`	`itemData.setShowLabel( true );`
`144`	`144`
`145`		`- QTreeWidgetItem *item = mAvailableWidgetsTree->addItem( catitem, itemData );`
	`145`	`+ mAvailableWidgetsTree->addItem( catitem, itemData );`
`146`	`146`	`catitem ->setExpanded( true );`
`147`	`147`	`}`
`148`	`148`
`@@ -851,6 +851,10 @@ QTreeWidgetItem DnDTree::addItem( QTreeWidgetItem parent, QgsAttributesFormPro`
`851`	`851`	`case QgsAttributesFormProperties::DnDTreeItemData::Container:`
`852`	`852`	`newItem->setIcon( 0, QgsApplication::getThemeIcon( "/mContainerIcon.svg" ) );`
`853`	`853`	`break;`
	`854`	`+`
	`855`	`+ case QgsAttributesFormProperties::DnDTreeItemData::QmlWidget:`
	`856`	`+ newItem->setIcon( 0, QgsApplication::getThemeIcon( "/mQmlWidgetIcon.svg" ) );`
	`857`	`+ break;`
`854`	`858`	`}`
`855`	`859`	`}`
`856`	`860`	`newItem->setData( 0, QgsAttributesFormProperties::DnDTreeRole, data );`
`@@ -914,16 +918,23 @@ bool DnDTree::dropMimeData( QTreeWidgetItem *parent, int index, const QMimeData`
`914`	`918`	`{`
`915`	`919`	`stream >> itemElement;`
`916`	`920`
	`921`	`+ QTreeWidgetItem *newItem;`
	`922`	`+`
`917`	`923`	`if ( parent )`
`918`	`924`	`{`
`919`		`- addItem( parent, itemElement, index );`
	`925`	`+ newItem = addItem( parent, itemElement, index );`
`920`	`926`	`bDropSuccessful = true;`
`921`	`927`	`}`
`922`	`928`	`else`
`923`	`929`	`{`
`924`		`- addItem( invisibleRootItem(), itemElement, index );`
	`930`	`+ newItem = addItem( invisibleRootItem(), itemElement, index );`
`925`	`931`	`bDropSuccessful = true;`
`926`	`932`	`}`
	`933`	`+`
	`934`	`+ if ( itemElement.type() == QgsAttributesFormProperties::DnDTreeItemData::QmlWidget )`
	`935`	`+ {`
	`936`	`+ onItemDoubleClicked( newItem, 0 );`
	`937`	`+ }`
`927`	`938`	`}`
`928`	`939`	`}`
`929`	`940`
`@@ -1094,8 +1105,8 @@ void DnDTree::onItemDoubleClicked( QTreeWidgetItem *item, int column )`
`1094`	`1105`	`case QgsAttributesFormProperties::DnDTreeItemData::QmlWidget:`
`1095`	`1106`	`{`
`1096`	`1107`	`QDialog dlg;`
	`1108`	`+ dlg.resize( 600, 400 );`
`1097`	`1109`	`dlg.setWindowTitle( tr( "Configure QML Widget" ) );`
`1098`		`- dlg.setBaseSize( 600, 400 );`
`1099`	`1110`	`QFormLayout *layout = new QFormLayout() ;`
`1100`	`1111`	`dlg.setLayout( layout );`
`1101`	`1112`	`layout->addWidget( baseWidget );`