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

List:       kde-commits
Subject:    KDE/kdeedu/kalgebra/src
From:       Aleix Pol Gonzalez <aleixpol () gmail ! com>
Date:       2009-01-27 23:45:57
Message-ID: 1233099957.299719.19207.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 917522 by apol:

don't change the old console's variable view behaviour (for the moment)

 M  +4 -2      kalgebra.cpp  
 M  +2 -2      variablesmodel.cpp  
 M  +2 -0      variablesmodel.h  


--- trunk/KDE/kdeedu/kalgebra/src/kalgebra.cpp #917521:917522
@@ -71,12 +71,14 @@
 	this->addDockWidget(Qt::RightDockWidgetArea, c_dock_vars);
 	
 	c_varsModel=new VariablesModel(c_results->analitza()->variables());
+	c_varsModel->setEditable(false);
 	
 	c_variables = new QTreeView(c_dock_vars);
 	c_variables->setModel(c_varsModel);
 	c_variables->setRootIsDecorated(false);
+	c_variables->header()->setStretchLastSection(true);
+	c_variables->setSelectionBehavior(QAbstractItemView::SelectRows);
 	c_variables->setSelectionMode(QAbstractItemView::SingleSelection);
-	c_variables->header()->resizeSections(QHeaderView::ResizeToContents);
 	
 	c_exp = new ExpressionEdit(console);
 	c_exp->setAnalitza(c_results->analitza());
@@ -91,7 +93,7 @@
 	connect(c_results, SIGNAL(status(QString)), this, SLOT(changeStatusBar(QString)));
 	connect(c_results, SIGNAL(changed()), this, SLOT(updateInformation()));
 	connect(c_results, SIGNAL(changed()), c_exp, SLOT(updateCompleter()));
-// 	connect(c_variables, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(edit_var(QModelIndex)));
+	connect(c_variables, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(edit_var(QModelIndex)));
 	
 	////////menu
 	QMenu *c_menu = menuBar()->addMenu(i18n("C&onsole"));
--- trunk/KDE/kdeedu/kalgebra/src/variablesmodel.cpp #917521:917522
@@ -24,7 +24,7 @@
 #include <KDebug>
 
 VariablesModel::VariablesModel(Variables* v, QObject *parent)
-	: QAbstractTableModel(parent), m_vars(v)
+	: QAbstractTableModel(parent), m_vars(v), m_editable(true)
 {}
 
 QVariant VariablesModel::data(const QModelIndex & index, int role) const
@@ -98,7 +98,7 @@
 QFlags< Qt::ItemFlag > VariablesModel::flags(const QModelIndex& index) const
 {
 	QFlags< Qt::ItemFlag > ret = QAbstractItemModel::flags(index);
-	if(index.column()==1)
+	if(index.column()==1 && m_editable)
 		ret |= Qt::ItemIsEditable;
 	return ret;
 }
--- trunk/KDE/kdeedu/kalgebra/src/variablesmodel.h #917521:917522
@@ -41,12 +41,14 @@
 		int columnCount(const QModelIndex &p=QModelIndex()) const { Q_UNUSED(p); return 2; }
 		
 		void insertVariable(const QString& name, const Expression& value);
+		void setEditable(bool ed) { m_editable=ed; }
 	public slots:
 		/** Updates the variables information */
 		void updateInformation();
 		
 	private:
 		Variables *m_vars;
+		bool m_editable;
 };
 
 #endif
[prev in list] [next in list] [prev in thread] [next in thread]