add layers to group even group is not selected but selected child item

in this group
qgis · Dec 27, 2011 · 85918f6 · 85918f6
1 parent 9957ee5
commit 85918f6
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 17 deletions.
diff --git a/src/app/legend/qgslegend.cpp b/src/app/legend/qgslegend.cpp
@@ -809,6 +809,11 @@ void QgsLegend::addLayer( QgsMapLayer * layer )
 
   QgsLegendGroup *lg = dynamic_cast<QgsLegendGroup *>( currentItem() );
   QSettings settings;
+  if ( !lg && currentItem() )
+  {
+    lg = dynamic_cast<QgsLegendGroup *>( currentItem()->parent() );
+  }
+
   if ( lg && settings.value( "/qgis/addNewLayersToCurrentGroup", false ).toBool() )
   {
     lg->insertChild( 0, llayer );

diff --git a/src/ui/qgsoptionsbase.ui b/src/ui/qgsoptionsbase.ui
@@ -66,8 +66,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>799</width>
-            <height>761</height>
+            <width>803</width>
+            <height>763</height>
            </rect>
           </property>
           <layout class="QGridLayout" name="gridLayout_12">
@@ -388,7 +388,7 @@
               <item>
                <widget class="QCheckBox" name="cbxAddNewLayersToCurrentGroup">
                 <property name="text">
-                 <string>Add new layers to selected group</string>
+                 <string>Add new layers to selected or current group</string>
                 </property>
                </widget>
               </item>
@@ -635,8 +635,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>799</width>
-            <height>761</height>
+            <width>803</width>
+            <height>763</height>
            </rect>
           </property>
           <layout class="QGridLayout" name="gridLayout_8">
@@ -809,8 +809,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>799</width>
-            <height>761</height>
+            <width>803</width>
+            <height>763</height>
            </rect>
           </property>
           <layout class="QGridLayout" name="gridLayout_4">
@@ -1095,8 +1095,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>799</width>
-            <height>761</height>
+            <width>803</width>
+            <height>763</height>
            </rect>
           </property>
           <layout class="QGridLayout" name="gridLayout_10">
@@ -1170,8 +1170,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>773</width>
-            <height>735</height>
+            <width>781</width>
+            <height>741</height>
            </rect>
           </property>
           <layout class="QGridLayout" name="gridLayout_13">
@@ -1506,8 +1506,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>799</width>
-            <height>761</height>
+            <width>803</width>
+            <height>763</height>
            </rect>
           </property>
           <layout class="QGridLayout" name="gridLayout_15">
@@ -1680,8 +1680,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>799</width>
-            <height>761</height>
+            <width>803</width>
+            <height>763</height>
            </rect>
           </property>
           <layout class="QGridLayout" name="gridLayout_17">
@@ -1777,8 +1777,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>799</width>
-            <height>761</height>
+            <width>803</width>
+            <height>763</height>
            </rect>
           </property>
           <layout class="QGridLayout" name="gridLayout_20">