[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [labplot] src/kdefrontend: Don't allow to select unwanted objects in TreeViewComboBox in
From:       Alexander Semke <alexander.semke () web ! de>
Date:       2014-02-23 8:31:30
Message-ID: E1WHUTC-0005CE-Gf () scm ! kde ! org
[Download RAW message or body]

Git commit 7d206d77c2c81f91e40347cfffe007e2ba0b57bf by Alexander Semke.
Committed on 23/02/2014 at 08:30.
Pushed by asemke into branch 'master'.

Don't allow to select unwanted objects in TreeViewComboBox in
ImportDialog and XYCurveDock.

M  +6    -5    src/kdefrontend/datasources/ImportFileDialog.cpp
M  +5    -0    src/kdefrontend/dockwidgets/XYCurveDock.cpp

http://commits.kde.org/labplot/7d206d77c2c81f91e40347cfffe007e2ba0b57bf

diff --git a/src/kdefrontend/datasources/ImportFileDialog.cpp \
b/src/kdefrontend/datasources/ImportFileDialog.cpp index d2389eb..a04d2aa 100644
--- a/src/kdefrontend/datasources/ImportFileDialog.cpp
+++ b/src/kdefrontend/datasources/ImportFileDialog.cpp
@@ -101,6 +101,10 @@ void \
ImportFileDialog::setModel(std::auto_ptr<QAbstractItemModel> model){  \
cbAddTo->setTopLevelClasses(list);  hLayout->addWidget( cbAddTo);
   connect( cbAddTo, SIGNAL(currentModelIndexChanged(QModelIndex)), this, \
SLOT(currentAddToIndexChanged(QModelIndex)) ); +
+  list.clear();
+  list<<"Spreadsheet";
+  cbAddTo->setSelectableClasses(list);
 	
   bNewSpreadsheet = new QPushButton(frameAddTo);
   bNewSpreadsheet->setIcon(KIcon("insert-table"));
@@ -201,10 +205,8 @@ void ImportFileDialog::toggleOptions(){
 
 void ImportFileDialog::currentAddToIndexChanged(QModelIndex index){
 	AbstractAspect * aspect = static_cast<AbstractAspect *>(index.internalPointer());
-	if (!aspect)
-		return;
-	
-	if ( aspect->inherits("Spreadsheet") ){
+
+	if ( aspect ){
 		lPosition->setEnabled(true);
 		cbPosition->setEnabled(true);
 		enableButtonOk(true);
@@ -212,7 +214,6 @@ void ImportFileDialog::currentAddToIndexChanged(QModelIndex \
index){  lPosition->setEnabled(false);
 		cbPosition->setEnabled(false);
 		enableButtonOk(false);
-		cbAddTo->setCurrentModelIndex(QModelIndex());
 	}
 }
 
diff --git a/src/kdefrontend/dockwidgets/XYCurveDock.cpp \
b/src/kdefrontend/dockwidgets/XYCurveDock.cpp index 2bd618a..9dbd39d 100644
--- a/src/kdefrontend/dockwidgets/XYCurveDock.cpp
+++ b/src/kdefrontend/dockwidgets/XYCurveDock.cpp
@@ -413,6 +413,11 @@ void XYCurveDock::setModel(std::auto_ptr<AspectTreeModel> \
model){  m_aspectTreeModel->setSelectableAspects(list);
 	cbXColumn->setSelectableClasses(list);
 	cbYColumn->setSelectableClasses(list);
+	cbValuesColumn->setSelectableClasses(list);
+	cbXErrorMinusColumn->setSelectableClasses(list);
+	cbXErrorPlusColumn->setSelectableClasses(list);
+	cbYErrorMinusColumn->setSelectableClasses(list);
+	cbYErrorPlusColumn->setSelectableClasses(list);
 
 	m_initializing=true;
   	cbXColumn->setModel(m_aspectTreeModel.get());


[prev in list] [next in list] [prev in thread] [next in thread]