From da3868438e739310862bf65b0d0c8ffa864392e8 Mon Sep 17 00:00:00 2001 From: zecke Date: Mon, 14 Oct 2002 15:57:59 +0000 Subject: What does happen if you store the whole config inside the conf map? yes on save custom data overwrites fixed data... As a workaround we now do save custom data first and then the fixed stuff --- (limited to 'noncore/apps/opie-console/profilemanager.cpp') diff --git a/noncore/apps/opie-console/profilemanager.cpp b/noncore/apps/opie-console/profilemanager.cpp index c965700..4b88dec 100644 --- a/noncore/apps/opie-console/profilemanager.cpp +++ b/noncore/apps/opie-console/profilemanager.cpp @@ -42,6 +42,8 @@ void ProfileManager::load() { prof.setBackground( conf.readNumEntry("back") ); prof.setForeground( conf.readNumEntry("fore") ); prof.setTerminal( conf.readNumEntry("terminal") ); + + // THIS is evil because all data get's reset prof.setConf( conf.items( (*it) ) ); /* now add it */ @@ -94,21 +96,26 @@ Session* ProfileManager::fromProfile( const Profile& prof, QWidget* parent) { void ProfileManager::save( ) { QFile::remove( (QString(getenv("HOME") )+ "/Settings/opie-console-profiles.conf" ) ); ProfileConfig conf("opie-console-profiles"); - Profile::ValueList::Iterator it; - for (it = m_list.begin(); it != m_list.end(); ++it ) { - conf.setGroup( (*it).name() ); - conf.writeEntry( "name", (*it).name() ); - conf.writeEntry( "iolayer", QString::fromUtf8( (*it).ioLayerName() ) ); - conf.writeEntry( "term", QString::fromUtf8( (*it).terminalName() ) ); - conf.writeEntry( "back", (*it).background() ); - conf.writeEntry( "fore", (*it).foreground() ); - conf.writeEntry( "terminal", (*it).terminal() ); + Profile::ValueList::Iterator it2; + for (it2 = m_list.begin(); it2 != m_list.end(); ++it2 ) { + conf.setGroup( (*it2).name() ); + /* now the config stuff */ - QMap map = (*it).conf(); - QMap::Iterator it; - for ( it = map.begin(); it != map.end(); ++it ) { - conf.writeEntry( it.key(), it.data() ); + QMap map = (*it2).conf(); + QMap::Iterator confIt; + for ( confIt = map.begin(); confIt != map.end(); ++confIt ) { + conf.writeEntry( confIt.key(), confIt.data() ); } + + conf.writeEntry( "name", (*it2).name() ); + QString str = QString::fromUtf8( (*it2).ioLayerName() ); + qWarning("IOLayerName " + str ); + + conf.writeEntry( "iolayer", str ); + conf.writeEntry( "term", QString::fromUtf8( (*it2).terminalName() ) ); + conf.writeEntry( "back", (*it2).background() ); + conf.writeEntry( "fore", (*it2).foreground() ); + conf.writeEntry( "terminal", (*it2).terminal() ); } } void ProfileManager::setProfiles( const Profile::ValueList& list ) { -- cgit v0.9.0.2