-rw-r--r-- | noncore/apps/confedit/listviewconfdir.cpp | 2 | ||||
-rw-r--r-- | noncore/apps/confedit/listviewitemconffile.cpp | 25 | ||||
-rw-r--r-- | noncore/apps/confedit/listviewitemconffile.h | 1 | ||||
-rw-r--r-- | noncore/apps/confedit/mainwindow.cpp | 31 |
4 files changed, 21 insertions, 38 deletions
diff --git a/noncore/apps/confedit/listviewconfdir.cpp b/noncore/apps/confedit/listviewconfdir.cpp index b76e425..f466f06 100644 --- a/noncore/apps/confedit/listviewconfdir.cpp +++ b/noncore/apps/confedit/listviewconfdir.cpp @@ -35,9 +35,9 @@ void ListViewConfDir::readConfFiles() { confDir.setFilter( QDir::Files | QDir::NoSymLinks ); confDir.setSorting( QDir::Name ); - + confDir.setNameFilter("*.conf"); const QFileInfoList *list = confDir.entryInfoList(); QFileInfoListIterator it( *list ); QFileInfo *fi; diff --git a/noncore/apps/confedit/listviewitemconffile.cpp b/noncore/apps/confedit/listviewitemconffile.cpp index 5457384..a8fd770 100644 --- a/noncore/apps/confedit/listviewitemconffile.cpp +++ b/noncore/apps/confedit/listviewitemconffile.cpp @@ -20,9 +20,8 @@ ListViewItemConfFile::ListViewItemConfFile(QFileInfo *file, QListView *parent) : ListViewItemConf(parent), _valid(false) { confFileInfo = file; parseFile(); - _changed = false; displayText(); } ListViewItemConfFile::~ListViewItemConfFile() @@ -31,9 +30,9 @@ ListViewItemConfFile::~ListViewItemConfFile() void ListViewItemConfFile::displayText() { - setText(0,(_changed?"*":"*")+confFileInfo->fileName()); + setText(0,(_changed?"*":"")+confFileInfo->fileName()); } QString ListViewItemConfFile::fileName() { @@ -41,12 +40,9 @@ QString ListViewItemConfFile::fileName() } void ListViewItemConfFile::parseFile() { - qDebug( confFileInfo->absFilePath() ); QFile confFile(confFileInfo->absFilePath()); - qDebug( confFileInfo->absFilePath() ); - // QString fileName = confFileInfo->fileName(); if(! confFile.open(IO_ReadOnly)) QMessageBox::critical(0,tr("Could not open"),tr("The file ")+confFileInfo->fileName()+tr(" could not be opened."),1,0); QTextStream t( &confFile ); QString s; @@ -63,9 +59,9 @@ void ListViewItemConfFile::parseFile() break; }else if ( s[0] == '[' && s[s.length()-1] == ']' ) { - qDebug("got group"+s); + // qDebug("got group"+s); group = s.mid(1,s.length()-2); groupItem = new ListViewItemConfigEntry(this, group ); insertItem( groupItem ); } else @@ -81,8 +77,23 @@ void ListViewItemConfFile::parseFile() } void ListViewItemConfFile::save() { - qDebug("ListViewItemConfFile::save()"); + if (!_changed) return; + QString backup = confFileInfo->absFilePath()+"~"; + qDebug("make backup to "+backup); + QFile conf(confFileInfo->absFilePath()); + QFile back(backup); + + if (!conf.open(IO_ReadOnly)) return; + if (!back.open(IO_WriteOnly)) return; + + #define SIZE 124 + char buf[SIZE]; + while (int c = conf.readBlock(buf, SIZE) ) back.writeBlock(buf,c); + conf.close(); + back.close(); + + qDebug("no saveing yet..."); unchanged(); } diff --git a/noncore/apps/confedit/listviewitemconffile.h b/noncore/apps/confedit/listviewitemconffile.h index 9208918..d89b19c 100644 --- a/noncore/apps/confedit/listviewitemconffile.h +++ b/noncore/apps/confedit/listviewitemconffile.h @@ -24,9 +24,8 @@ public: ~ListViewItemConfFile(); void parseFile(); QString fileName(); virtual void displayText(); - /** No descriptions */ void save(); protected: private: bool _valid; diff --git a/noncore/apps/confedit/mainwindow.cpp b/noncore/apps/confedit/mainwindow.cpp index 5eeeb90..30dfdf7 100644 --- a/noncore/apps/confedit/mainwindow.cpp +++ b/noncore/apps/confedit/mainwindow.cpp @@ -85,23 +85,21 @@ MainWindow::~MainWindow() void MainWindow::setCurrent(QListViewItem *item) { - qDebug("MainWindow::setCurrent("); if (!item) return; - qDebug("cast ListViewItemConf"); ListViewItemConf *i = (ListViewItemConf*) item; if (!i) return; if (i->getType() == ListViewItemConf::File) { + qDebug("start timer"); popupTimer->start( 750, true ); editor->hide(); updateGeometry(); _currentItem=0; _fileItem = (ListViewItemConfFile*)item; return; }else editor->show(); - qDebug("cast ListViewItemConfigEntry"); _fileItem = 0; _currentItem = (ListViewItemConfigEntry*)item; if (!_currentItem) return; QString file = _currentItem->getFile(); @@ -164,32 +162,7 @@ void MainWindow::showPopup() popupAction->addTo( popupMenu ); connect( popupAction, SIGNAL( activated() ), this , SLOT( saveConfFile() ) ); -// if ( !activePackage->installed() ) -// { -// popupMenu->insertItem( tr("Install to"), destsMenu ); -// QStringList dests = settings->getDestinationNames(); -// QString ad = settings->getDestinationName(); -// for (uint i = 0; i < dests.count(); i++ ) -// { -// popupAction = new QAction( dests[i], QString::null, 0, this, 0 ); -// popupAction->addTo( destsMenu ); -// if ( dests[i] == ad && activePackage->toInstall() ) -// { -// popupAction->setToggleAction( true ); -// popupAction->setOn(true); -// }; -// } -// connect( destsMenu, SIGNAL( activated( int ) ), -// this, SLOT( changePackageDest( int ) ) ); -// }else{ -// popupAction = new QAction( tr("Remove"),QString::null, 0, this, 0 ); -// popupAction->addTo( popupMenu ); -// connect( popupAction, SIGNAL( activated() ), -// this , SLOT( toggleProcess() ) ); -// popupAction = new QAction( tr("Reinstall"),QString::null, 0, this, 0 ); -// popupAction->addTo( popupMenu ); -// popupAction->setEnabled( false ); -// } + popupMenu->popup( QCursor::pos() ); } |