summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/apps/confedit/listviewconfdir.cpp2
-rw-r--r--noncore/apps/confedit/listviewitemconffile.cpp25
-rw-r--r--noncore/apps/confedit/listviewitemconffile.h1
-rw-r--r--noncore/apps/confedit/mainwindow.cpp31
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
@@ -31,17 +31,17 @@ ListViewConfDir::~ListViewConfDir()
{
}
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;
ListViewItemConfFile *fileEntry;
while ( (fi=it.current()) )
{
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
@@ -16,41 +16,37 @@
#define tr QObject::tr
ListViewItemConfFile::ListViewItemConfFile(QFileInfo *file, QListView *parent)
: ListViewItemConf(parent), _valid(false)
{
confFileInfo = file;
parseFile();
- _changed = false;
displayText();
}
ListViewItemConfFile::~ListViewItemConfFile()
{
}
void ListViewItemConfFile::displayText()
{
- setText(0,(_changed?"*":"*")+confFileInfo->fileName());
+ setText(0,(_changed?"*":"")+confFileInfo->fileName());
}
QString ListViewItemConfFile::fileName()
{
return confFileInfo->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;
QString group;
ListViewItemConfigEntry *groupItem;
ListViewItemConfigEntry *item;
while ( !t.atEnd() )
@@ -59,17 +55,17 @@ void ListViewItemConfFile::parseFile()
// qDebug( "line: >%s<\n", s.latin1() );
if (s.contains("<?xml"))
{
_valid = false;
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
if ( int pos = s.find('=') )
{
// qDebug("got key"+s);
item = new ListViewItemConfigEntry(this, group, s );
@@ -77,12 +73,27 @@ void ListViewItemConfFile::parseFile()
}
}
confFile.close();
setExpandable( _valid );
}
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
@@ -20,17 +20,16 @@
class ListViewItemConfFile : public ListViewItemConf {
public:
ListViewItemConfFile(QFileInfo *file, QListView *parent=0);
~ListViewItemConfFile();
void parseFile();
QString fileName();
virtual void displayText();
- /** No descriptions */
void save();
protected:
private:
bool _valid;
QFileInfo *confFileInfo;
};
#endif
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
@@ -81,31 +81,29 @@ void MainWindow::makeMenu()
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();
QString group = _currentItem->getGroup();
QString key = _currentItem->getKey();
QString val = _currentItem->getValue();
editor->TextFileName->setText(file);
@@ -160,36 +158,11 @@ void MainWindow::showPopup()
popupMenu->clear();
QAction *popupAction;
popupAction = new QAction( tr("Save"),QString::null, 0, this, 0 );
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() );
}