summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/apps/confedit/listviewitemconffile.cpp15
-rw-r--r--noncore/apps/confedit/mainwindow.cpp1
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
@@ -90,10 +90,9 @@ void ListViewItemConfFile::remove()
90 90
91void ListViewItemConfFile::revert() 91void ListViewItemConfFile::revert()
92{ 92{
93 if (_changed) 93 if (!_changed)
94 { 94 {
95 parseFile(); 95 // read the backup file
96 }else{
97 QFile conf(confFileInfo->absFilePath()); 96 QFile conf(confFileInfo->absFilePath());
98 QFile back(backupFileName()); 97 QFile back(backupFileName());
99 98
@@ -106,6 +105,8 @@ void ListViewItemConfFile::revert()
106 conf.close(); 105 conf.close();
107 back.close(); 106 back.close();
108 } 107 }
108 parseFile();
109 expand();
109} 110}
110 111
111void ListViewItemConfFile::save() 112void ListViewItemConfFile::save()
@@ -147,5 +148,13 @@ QString ListViewItemConfFile::backupFileName()
147 148
148void ListViewItemConfFile::expand() 149void ListViewItemConfFile::expand()
149{ 150{
151 QListViewItem *subItem = firstChild();
152 QListViewItem *toDel;
153 while(subItem)
154 {
155 toDel = subItem;
156 subItem = subItem->nextSibling();
157 delete toDel;
158 }
150 parseFile(); 159 parseFile();
151} 160}
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
@@ -73,6 +73,7 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) :
73 SLOT( valueChanged(const QString&) ) ); 73 SLOT( valueChanged(const QString&) ) );
74 74
75 setCurrent(0); 75 setCurrent(0);
76 editor->layoutType(EditWidget::File);
76} 77}
77 78
78void MainWindow::makeMenu() 79void MainWindow::makeMenu()