author | zecke <zecke> | 2002-10-14 15:57:59 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-10-14 15:57:59 (UTC) |
commit | da3868438e739310862bf65b0d0c8ffa864392e8 (patch) (unidiff) | |
tree | 16cdd38a4fc088d4483eeab8363e9a3b503d3f25 | |
parent | 16caa7343f4190a31bd80a9caa76118d7177ad3f (diff) | |
download | opie-da3868438e739310862bf65b0d0c8ffa864392e8.zip opie-da3868438e739310862bf65b0d0c8ffa864392e8.tar.gz opie-da3868438e739310862bf65b0d0c8ffa864392e8.tar.bz2 |
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
-rw-r--r-- | noncore/apps/opie-console/profilemanager.cpp | 33 |
1 files changed, 20 insertions, 13 deletions
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 | |||
@@ -37,16 +37,18 @@ void ProfileManager::load() { | |||
37 | Profile prof; | 37 | Profile prof; |
38 | prof.setName( conf.readEntry("name") ); | 38 | prof.setName( conf.readEntry("name") ); |
39 | prof.setIOLayer( conf.readEntry("iolayer").utf8() ); | 39 | prof.setIOLayer( conf.readEntry("iolayer").utf8() ); |
40 | prof.setTerminalName( conf.readEntry("term").utf8() ); | 40 | prof.setTerminalName( conf.readEntry("term").utf8() ); |
41 | qWarning(" %s %s", conf.readEntry("iolayer").latin1(), prof.ioLayerName().data() ); | 41 | qWarning(" %s %s", conf.readEntry("iolayer").latin1(), prof.ioLayerName().data() ); |
42 | prof.setBackground( conf.readNumEntry("back") ); | 42 | prof.setBackground( conf.readNumEntry("back") ); |
43 | prof.setForeground( conf.readNumEntry("fore") ); | 43 | prof.setForeground( conf.readNumEntry("fore") ); |
44 | prof.setTerminal( conf.readNumEntry("terminal") ); | 44 | prof.setTerminal( conf.readNumEntry("terminal") ); |
45 | |||
46 | // THIS is evil because all data get's reset | ||
45 | prof.setConf( conf.items( (*it) ) ); | 47 | prof.setConf( conf.items( (*it) ) ); |
46 | 48 | ||
47 | /* now add it */ | 49 | /* now add it */ |
48 | m_list.append( prof ); | 50 | m_list.append( prof ); |
49 | } | 51 | } |
50 | 52 | ||
51 | } | 53 | } |
52 | void ProfileManager::clear() { | 54 | void ProfileManager::clear() { |
@@ -89,31 +91,36 @@ Session* ProfileManager::fromProfile( const Profile& prof, QWidget* parent) { | |||
89 | wid ) ); | 91 | wid ) ); |
90 | session->connect(); | 92 | session->connect(); |
91 | 93 | ||
92 | return session; | 94 | return session; |
93 | } | 95 | } |
94 | void ProfileManager::save( ) { | 96 | void ProfileManager::save( ) { |
95 | QFile::remove( (QString(getenv("HOME") )+ "/Settings/opie-console-profiles.conf" ) ); | 97 | QFile::remove( (QString(getenv("HOME") )+ "/Settings/opie-console-profiles.conf" ) ); |
96 | ProfileConfig conf("opie-console-profiles"); | 98 | ProfileConfig conf("opie-console-profiles"); |
97 | Profile::ValueList::Iterator it; | 99 | Profile::ValueList::Iterator it2; |
98 | for (it = m_list.begin(); it != m_list.end(); ++it ) { | 100 | for (it2 = m_list.begin(); it2 != m_list.end(); ++it2 ) { |
99 | conf.setGroup( (*it).name() ); | 101 | conf.setGroup( (*it2).name() ); |
100 | conf.writeEntry( "name", (*it).name() ); | 102 | |
101 | conf.writeEntry( "iolayer", QString::fromUtf8( (*it).ioLayerName() ) ); | ||
102 | conf.writeEntry( "term", QString::fromUtf8( (*it).terminalName() ) ); | ||
103 | conf.writeEntry( "back", (*it).background() ); | ||
104 | conf.writeEntry( "fore", (*it).foreground() ); | ||
105 | conf.writeEntry( "terminal", (*it).terminal() ); | ||
106 | /* now the config stuff */ | 103 | /* now the config stuff */ |
107 | QMap<QString, QString> map = (*it).conf(); | 104 | QMap<QString, QString> map = (*it2).conf(); |
108 | QMap<QString, QString>::Iterator it; | 105 | QMap<QString, QString>::Iterator confIt; |
109 | for ( it = map.begin(); it != map.end(); ++it ) { | 106 | for ( confIt = map.begin(); confIt != map.end(); ++confIt ) { |
110 | conf.writeEntry( it.key(), it.data() ); | 107 | conf.writeEntry( confIt.key(), confIt.data() ); |
111 | } | 108 | } |
109 | |||
110 | conf.writeEntry( "name", (*it2).name() ); | ||
111 | QString str = QString::fromUtf8( (*it2).ioLayerName() ); | ||
112 | qWarning("IOLayerName " + str ); | ||
113 | |||
114 | conf.writeEntry( "iolayer", str ); | ||
115 | conf.writeEntry( "term", QString::fromUtf8( (*it2).terminalName() ) ); | ||
116 | conf.writeEntry( "back", (*it2).background() ); | ||
117 | conf.writeEntry( "fore", (*it2).foreground() ); | ||
118 | conf.writeEntry( "terminal", (*it2).terminal() ); | ||
112 | } | 119 | } |
113 | } | 120 | } |
114 | void ProfileManager::setProfiles( const Profile::ValueList& list ) { | 121 | void ProfileManager::setProfiles( const Profile::ValueList& list ) { |
115 | m_list = list; | 122 | m_list = list; |
116 | }; | 123 | }; |
117 | Profile ProfileManager::profile( const QString& name )const { | 124 | Profile ProfileManager::profile( const QString& name )const { |
118 | Profile prof; | 125 | Profile prof; |
119 | Profile::ValueList::ConstIterator it; | 126 | Profile::ValueList::ConstIterator it; |