[QGIS Commit] r10375 - in trunk/qgis/src: app ui

[svn_qgis at osgeo.org]

Author: wonder
Date: 2009-03-21 14:18:03 -0400 (Sat, 21 Mar 2009)
New Revision: 10375

Modified:
   trunk/qgis/src/app/qgsoptions.cpp
   trunk/qgis/src/ui/qgsoptionsbase.ui
Log:
removed attribute table behaviour setting from options (not necessary with new attribute table :-)


Modified: trunk/qgis/src/app/qgsoptions.cpp
===================================================================
--- trunk/qgis/src/app/qgsoptions.cpp	2009-03-21 18:06:49 UTC (rev 10374)
+++ trunk/qgis/src/app/qgsoptions.cpp	2009-03-21 18:18:03 UTC (rev 10375)
@@ -90,13 +90,6 @@
   // set the current theme
   cmbTheme->setItemText( cmbTheme->currentIndex(), settings.value( "/Themes" ).toString() );
 
-  // set the attribute table behaviour
-  cmbAttrTableBehaviour->clear();
-  cmbAttrTableBehaviour->addItem( tr( "Show all features" ) );
-  cmbAttrTableBehaviour->addItem( tr( "Show selected features" ) );
-  cmbAttrTableBehaviour->addItem( tr( "Show features in current canvas" ) );
-  cmbAttrTableBehaviour->setCurrentIndex( settings.value( "/qgis/attributeTableBehaviour", 0 ).toInt() );
-
   // set the display update threshold
   spinBoxUpdateThreshold->setValue( settings.value( "/Map/updateThreshold" ).toInt() );
   //set the default projection behaviour radio buttongs
@@ -310,7 +303,6 @@
   settings.setValue( "/qgis/showLegendClassifiers", cbxLegendClassifiers->isChecked() );
   settings.setValue( "/qgis/hideSplash", cbxHideSplash->isChecked() );
   settings.setValue( "/qgis/dockAttributeTable", cbxAttributeTableDocked->isChecked() );
-  settings.setValue( "/qgis/attributeTableBehaviour", cmbAttrTableBehaviour->currentIndex() );
   settings.setValue( "/qgis/new_layers_visible", chkAddedVisibility->isChecked() );
   settings.setValue( "/qgis/enable_anti_aliasing", chkAntiAliasing->isChecked() );
   settings.setValue( "/qgis/use_qimage_to_render", !( chkUseQPixmap->isChecked() ) );

Modified: trunk/qgis/src/ui/qgsoptionsbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsoptionsbase.ui	2009-03-21 18:06:49 UTC (rev 10374)
+++ trunk/qgis/src/ui/qgsoptionsbase.ui	2009-03-21 18:18:03 UTC (rev 10375)
@@ -220,34 +220,6 @@
             </property>
            </widget>
           </item>
-          <item row="6" column="0" >
-           <widget class="QLabel" name="textLabel1_6" >
-            <property name="sizePolicy" >
-             <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="text" >
-             <string>Attribute table behaviour</string>
-            </property>
-            <property name="buddy" >
-             <cstring>cmbAttrTableBehaviour</cstring>
-            </property>
-           </widget>
-          </item>
-          <item row="6" column="1" >
-           <widget class="QComboBox" name="cmbAttrTableBehaviour" >
-            <property name="duplicatesEnabled" >
-             <bool>false</bool>
-            </property>
-            <item>
-             <property name="text" >
-              <string/>
-             </property>
-            </item>
-           </widget>
-          </item>
          </layout>
         </widget>
        </item>
@@ -1164,7 +1136,6 @@
   <tabstop>spinBoxUpdateThreshold</tabstop>
   <tabstop>chkAntiAliasing</tabstop>
   <tabstop>chkUseQPixmap</tabstop>
-  <tabstop>cbxSplitterRedraw</tabstop>
   <tabstop>spinBoxIdentifyValue</tabstop>
   <tabstop>cmbEllipsoid</tabstop>
   <tabstop>pbnMeasureColour</tabstop>