2 files changed, 13 insertions, 3 deletions

diff --git a/noncore/apps/confedit/listviewitemconffile.cpp b/noncore/apps/confedit/listviewitemconffile.cpp
index 1f85095..ce6504c 100644
--- a/noncore/apps/confedit/listviewitemconffile.cpp
+++ b/noncore/apps/confedit/listviewitemconffile.cpp
@@ -77,48 +77,49 @@ void ListViewItemConfFile::parseFile()
   }	
 	confFile.close();
 	setExpandable( _valid );
 //	qDebug("ListViewItemConfFile::parseFile END");
 }
 
 
 void ListViewItemConfFile::remove()
 {
   QFile::remove(confFileInfo->absFilePath());
   QFile::remove(backupFileName());
   delete this;
 }
 
 void ListViewItemConfFile::revert()
 {
-	if (_changed)
+	if (!_changed)
  	{
-    parseFile();
-  }else{
+  	// read the backup file
 	 	QFile conf(confFileInfo->absFilePath());
   	QFile back(backupFileName());
 
 	  if (!back.open(IO_ReadOnly)) return;
   	if (!conf.open(IO_WriteOnly)) return;
 
 	  #define SIZE 124
   	char buf[SIZE];
 	  while (int c = back.readBlock(buf, SIZE) ) conf.writeBlock(buf,c);
   	conf.close();
 	  back.close();
   }
+  parseFile();
+  expand();
 }
 
 void ListViewItemConfFile::save()
 {
 	if (!_changed) return;
  	QFile conf(confFileInfo->absFilePath());
   QFile back(backupFileName());
 
   if (!conf.open(IO_ReadOnly)) return;
   if (!back.open(IO_WriteOnly)) return;
 
   char buf[SIZE];
   while (int c = conf.readBlock(buf, SIZE) ) back.writeBlock(buf,c);
   conf.close();
   back.close();
 
@@ -134,18 +135,26 @@ void ListViewItemConfFile::save()
 }
 
 
 bool ListViewItemConfFile::revertable()
 {
  	return _changed || QFile(backupFileName()).exists();
 }
 
 QString ListViewItemConfFile::backupFileName()
 {
 	return confFileInfo->absFilePath()+"~";
 }
 
 
 void ListViewItemConfFile::expand()
 {
+	QListViewItem *subItem = firstChild();
+	QListViewItem *toDel;
+ 	while(subItem)
+  {
+  	toDel = subItem;
+   	subItem = subItem->nextSibling();
+   	delete toDel;
+  }
 	parseFile();
 }
diff --git a/noncore/apps/confedit/mainwindow.cpp b/noncore/apps/confedit/mainwindow.cpp
index 6de8741..c91c846 100644
--- a/noncore/apps/confedit/mainwindow.cpp
+++ b/noncore/apps/confedit/mainwindow.cpp
@@ -60,32 +60,33 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) :
 
   makeMenu();
 
   connect(settingList, SIGNAL( pressed(QListViewItem*) ),
 						this, SLOT(setCurrent(QListViewItem*)));
 	connect( settingList, SIGNAL( clicked( QListViewItem* ) ),
 					   this, SLOT( stopTimer( QListViewItem* ) ) );	
 
  	connect( editor->LineEditGroup, SIGNAL( textChanged(const QString&) ),
 	           SLOT( groupChanged(const QString&) ) );
 	connect( editor->LineEditKey, SIGNAL( textChanged(const QString&) ),
 	           SLOT( keyChanged(const QString&) ) );
  	connect( editor->LineEditValue, SIGNAL( textChanged(const QString&) ),
 	           SLOT( valueChanged(const QString&) ) );
 
  	setCurrent(0);
+  editor->layoutType(EditWidget::File);
 }
 
 void MainWindow::makeMenu()
 {
   popupTimer = new QTimer(this);
   popupMenuFile = new QPopupMenu(this);
   popupMenuEntry = new QPopupMenu(this);
 
 	popupActionSave = new QAction( tr("Save"),QString::null,  0, this, 0 );
 	popupActionSave->addTo( popupMenuFile );
  // popupActionSave->addTo( popupMenuEntry );
   connect( popupActionSave, SIGNAL( activated() ),
 		  	 	this , SLOT( saveConfFile() ) );
 
 	popupActionRevert = new QAction( tr("Revert"),QString::null,  0, this, 0 );
 	popupActionRevert->addTo( popupMenuFile );