-rw-r--r-- | noncore/apps/opie-console/profile.cpp | 6 | ||||
-rw-r--r-- | noncore/apps/opie-console/profile.h | 3 | ||||
-rw-r--r-- | noncore/apps/opie-console/profilemanager.cpp | 23 |
3 files changed, 26 insertions, 6 deletions
diff --git a/noncore/apps/opie-console/profile.cpp b/noncore/apps/opie-console/profile.cpp index cdf595e..c8f5eb0 100644 --- a/noncore/apps/opie-console/profile.cpp +++ b/noncore/apps/opie-console/profile.cpp | |||
@@ -33,6 +33,9 @@ Profile &Profile::operator=( const Profile& prof ) { | |||
33 | } | 33 | } |
34 | Profile::~Profile() { | 34 | Profile::~Profile() { |
35 | } | 35 | } |
36 | QMap<QString, QString> Profile::conf()const { | ||
37 | return m_conf; | ||
38 | } | ||
36 | QString Profile::name()const { | 39 | QString Profile::name()const { |
37 | return m_name; | 40 | return m_name; |
38 | } | 41 | } |
@@ -104,3 +107,6 @@ int Profile::readNumEntry( const QString& key, int def )const { | |||
104 | bool Profile::readBoolEntry( const QString& key, bool def )const { | 107 | bool Profile::readBoolEntry( const QString& key, bool def )const { |
105 | return readNumEntry( key, def ); | 108 | return readNumEntry( key, def ); |
106 | } | 109 | } |
110 | void Profile::setConf( const QMap<QString, QString>& conf ) { | ||
111 | m_conf = conf; | ||
112 | }; | ||
diff --git a/noncore/apps/opie-console/profile.h b/noncore/apps/opie-console/profile.h index eff2be1..9956bdb 100644 --- a/noncore/apps/opie-console/profile.h +++ b/noncore/apps/opie-console/profile.h | |||
@@ -40,7 +40,7 @@ public: | |||
40 | /* | 40 | /* |
41 | * config stuff | 41 | * config stuff |
42 | */ | 42 | */ |
43 | QMap<QString, QString> conf(); | 43 | QMap<QString, QString> conf()const; |
44 | void clearConf(); | 44 | void clearConf(); |
45 | void writeEntry( const QString& key, const QString& value ); | 45 | void writeEntry( const QString& key, const QString& value ); |
46 | void writeEntry( const QString& key, int num ); | 46 | void writeEntry( const QString& key, int num ); |
@@ -55,6 +55,7 @@ public: | |||
55 | void setBackground( int back ); | 55 | void setBackground( int back ); |
56 | void setForeground( int fore ); | 56 | void setForeground( int fore ); |
57 | void setTerminal( int term ); | 57 | void setTerminal( int term ); |
58 | void setConf( const QMap<QString, QString>& ); | ||
58 | private: | 59 | private: |
59 | QMap<QString, QString> m_conf; | 60 | QMap<QString, QString> m_conf; |
60 | QString m_name; | 61 | QString m_name; |
diff --git a/noncore/apps/opie-console/profilemanager.cpp b/noncore/apps/opie-console/profilemanager.cpp index 54b184d..c8a4db5 100644 --- a/noncore/apps/opie-console/profilemanager.cpp +++ b/noncore/apps/opie-console/profilemanager.cpp | |||
@@ -22,9 +22,6 @@ void ProfileManager::load() { | |||
22 | /* | 22 | /* |
23 | * for each profile | 23 | * for each profile |
24 | */ | 24 | */ |
25 | /* | ||
26 | * QAsciiDict Parsing FIXME | ||
27 | */ | ||
28 | for ( it = groups.begin(); it != groups.end(); ++it ) { | 25 | for ( it = groups.begin(); it != groups.end(); ++it ) { |
29 | conf.setGroup( (*it) ); | 26 | conf.setGroup( (*it) ); |
30 | Profile prof; | 27 | Profile prof; |
@@ -33,7 +30,9 @@ void ProfileManager::load() { | |||
33 | prof.setBackground( conf.readNumEntry("back") ); | 30 | prof.setBackground( conf.readNumEntry("back") ); |
34 | prof.setForeground( conf.readNumEntry("fore") ); | 31 | prof.setForeground( conf.readNumEntry("fore") ); |
35 | prof.setTerminal( conf.readNumEntry("terminal") ); | 32 | prof.setTerminal( conf.readNumEntry("terminal") ); |
33 | prof.setConf( conf.items( (*it) ) ); | ||
36 | 34 | ||
35 | /* now add it */ | ||
37 | m_list.append( prof ); | 36 | m_list.append( prof ); |
38 | } | 37 | } |
39 | 38 | ||
@@ -52,7 +51,7 @@ Session* ProfileManager::fromProfile( const Profile& prof) { | |||
52 | /* | 51 | /* |
53 | * FIXME | 52 | * FIXME |
54 | * load emulation | 53 | * load emulation |
55 | * load widget | 54 | * load widget? |
56 | * set colors + fonts | 55 | * set colors + fonts |
57 | */ | 56 | */ |
58 | return session; | 57 | return session; |
@@ -60,6 +59,20 @@ Session* ProfileManager::fromProfile( const Profile& prof) { | |||
60 | void ProfileManager::save( ) { | 59 | void ProfileManager::save( ) { |
61 | ProfileConfig conf("opie-console-profiles"); | 60 | ProfileConfig conf("opie-console-profiles"); |
62 | conf.clearAll(); | 61 | conf.clearAll(); |
63 | Session* se= 0l; | 62 | Profile::ValueList::Iterator it; |
63 | for (it = m_list.begin(); it != m_list.end(); ++it ) { | ||
64 | conf.setGroup( (*it).name() ); | ||
65 | conf.writeEntry( "name", (*it).name() ); | ||
66 | conf.writeEntry( "ioplayer", (*it).ioLayerName() ); | ||
67 | conf.writeEntry( "back", (*it).background() ); | ||
68 | conf.writeEntry( "fore", (*it).foreground() ); | ||
69 | conf.writeEntry( "terminal", (*it).terminal() ); | ||
70 | /* now the config stuff */ | ||
71 | QMap<QString, QString> map = (*it).conf(); | ||
72 | QMap<QString, QString>::Iterator it; | ||
73 | for ( it = map.begin(); it != map.end(); ++it ) { | ||
74 | conf.writeEntry( it.key(), it.data() ); | ||
75 | } | ||
76 | } | ||
64 | // FIXME save | 77 | // FIXME save |
65 | } | 78 | } |