-rw-r--r-- | noncore/apps/confedit/listviewitemconffile.cpp | 15 | ||||
-rw-r--r-- | noncore/apps/confedit/mainwindow.cpp | 1 |
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 | |||
@@ -89,12 +89,11 @@ void ListViewItemConfFile::remove() | |||
89 | } | 89 | } |
90 | 90 | ||
91 | void ListViewItemConfFile::revert() | 91 | void 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 | ||
100 | if (!back.open(IO_ReadOnly)) return; | 99 | if (!back.open(IO_ReadOnly)) return; |
@@ -105,8 +104,10 @@ void ListViewItemConfFile::revert() | |||
105 | while (int c = back.readBlock(buf, SIZE) ) conf.writeBlock(buf,c); | 104 | while (int c = back.readBlock(buf, SIZE) ) conf.writeBlock(buf,c); |
106 | conf.close(); | 105 | conf.close(); |
107 | back.close(); | 106 | back.close(); |
108 | } | 107 | } |
108 | parseFile(); | ||
109 | expand(); | ||
109 | } | 110 | } |
110 | 111 | ||
111 | void ListViewItemConfFile::save() | 112 | void ListViewItemConfFile::save() |
112 | { | 113 | { |
@@ -146,6 +147,14 @@ QString ListViewItemConfFile::backupFileName() | |||
146 | 147 | ||
147 | 148 | ||
148 | void ListViewItemConfFile::expand() | 149 | void 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 | |||
@@ -72,8 +72,9 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) : | |||
72 | connect( editor->LineEditValue, SIGNAL( textChanged(const QString&) ), | 72 | connect( editor->LineEditValue, SIGNAL( textChanged(const QString&) ), |
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 | ||
78 | void MainWindow::makeMenu() | 79 | void MainWindow::makeMenu() |
79 | { | 80 | { |