cleaned code, gui set to no drag and drop and single selection mode

qgis · Jul 5, 2011 · d4526de · d4526de
1 parent e1510a8
commit d4526de
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 22 deletions.
diff --git a/src/plugins/globe/globe_plugin_dialog.cpp b/src/plugins/globe/globe_plugin_dialog.cpp
@@ -37,8 +37,6 @@
 
  #include <osg/DisplaySettings>
 
- QList<DataSource> elevationsDatasources;
-
  //constructor
  QgsGlobePluginDialog::QgsGlobePluginDialog( QWidget* parent, Qt::WFlags fl )
  : QDialog( parent, fl )
@@ -206,6 +204,7 @@
      elevationDatasourcesWidget->setRowCount(1+i);
      elevationDatasourcesWidget->setItem(i, 0, type);
      elevationDatasourcesWidget->setItem(i, 1, uri);
+     elevationDatasourcesWidget->setCurrentItem(type, QItemSelectionModel::Clear);
    }
  }
 
@@ -236,27 +235,20 @@
 
  void QgsGlobePluginDialog::saveElevationDatasources()
  {
-   elevationsDatasources.clear();
+   settings.beginGroup("Plugin-Globe");
+   settings.remove("ElevationsDatasources");
+   settings.beginWriteArray("ElevationsDatasources");
 
    for(int i = 0; i < elevationDatasourcesWidget->rowCount(); ++i)
    {
-     QTableWidgetItem* type = elevationDatasourcesWidget->item(i, 0);
-     QTableWidgetItem* uri = elevationDatasourcesWidget->item(i, 1);
-     DataSource ds;
-     ds.uri = uri->text();
-     ds.type = type->text();
-     elevationsDatasources.append(ds);
-   }
+     QString type = elevationDatasourcesWidget->item(i, 0)->text();
+     QString uri = elevationDatasourcesWidget->item(i, 1)->text();
 
-   settings.beginGroup("Plugin-Globe");
-   settings.remove("");
-   settings.beginWriteArray("ElevationsDatasources");
-   for (int i = 0; i < elevationsDatasources.size(); ++i)
-   {
      settings.setArrayIndex(i);
-     settings.setValue("type", elevationsDatasources.at(i).type);
-     settings.setValue("uri", elevationsDatasources.at(i).uri);
+     settings.setValue("type", type);
+     settings.setValue("uri", uri);
    }
+
    settings.endArray();
    settings.endGroup();
  }

diff --git a/src/plugins/globe/globe_plugin_dialog.h b/src/plugins/globe/globe_plugin_dialog.h
@@ -73,9 +73,4 @@ class QgsGlobePluginDialog:public QDialog, private Ui::QgsGlobePluginDialogGuiBa
     void on_elevationRemove_clicked();
 };
 
-struct DataSource {
-  QString type;
-  QString uri;
-};
-
 #endif				// QGIS_GLOBE_PLUGIN_DIALOG_H
diff --git a/src/plugins/globe/globe_plugin_dialog_guibase.ui b/src/plugins/globe/globe_plugin_dialog_guibase.ui
@@ -199,6 +199,9 @@
          <property name="alternatingRowColors">
           <bool>true</bool>
          </property>
+         <property name="selectionMode">
+          <enum>QAbstractItemView::SingleSelection</enum>
+         </property>
          <property name="selectionBehavior">
           <enum>QAbstractItemView::SelectRows</enum>
          </property>