author | sandman <sandman> | 2002-09-25 23:11:05 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-09-25 23:11:05 (UTC) |
commit | 0c6ce9f1600bf1efb7736f87fd14dd8215db851f (patch) (unidiff) | |
tree | 13d1367dc79a64d44ef83f57259e04a0be099f8c /core/settings/launcher/tabssettings.cpp | |
parent | bdbd20a9a0415e2284e21923ed03d4ca3f6615e8 (diff) | |
download | opie-0c6ce9f1600bf1efb7736f87fd14dd8215db851f.zip opie-0c6ce9f1600bf1efb7736f87fd14dd8215db851f.tar.gz opie-0c6ce9f1600bf1efb7736f87fd14dd8215db851f.tar.bz2 |
load and save of tab settings works now -- bg image still missing
Diffstat (limited to 'core/settings/launcher/tabssettings.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/settings/launcher/tabssettings.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/settings/launcher/tabssettings.cpp b/core/settings/launcher/tabssettings.cpp index fc2d2c9..ae78733 100644 --- a/core/settings/launcher/tabssettings.cpp +++ b/core/settings/launcher/tabssettings.cpp | |||
@@ -115,19 +115,21 @@ void TabsSettings::readTabSettings ( ) | |||
115 | 115 | ||
116 | tc. m_bg_image = cfg. readEntry ( "BackgroundImage", "wallpaper/opie" ); | 116 | tc. m_bg_image = cfg. readEntry ( "BackgroundImage", "wallpaper/opie" ); |
117 | tc. m_bg_color = cfg. readEntry ( "BackgroundColor" ); | 117 | tc. m_bg_color = cfg. readEntry ( "BackgroundColor" ); |
118 | tc. m_text_color = cfg. readEntry ( "TextColor" ); | 118 | tc. m_text_color = cfg. readEntry ( "TextColor" ); |
119 | QStringList f = cfg. readListEntry ( "Font", ',' ); | 119 | QStringList f = cfg. readListEntry ( "Font", ',' ); |
120 | if ( f. count ( ) == 4 ) { | 120 | if ( f. count ( ) == 4 ) { |
121 | tc. m_font_family = f [0]; | 121 | tc. m_font_family = f [0]; |
122 | tc. m_font_size = f [1]. toInt ( ); | 122 | tc. m_font_size = f [1]. toInt ( ); |
123 | tc. m_font_style = f [2]; | ||
123 | } else { | 124 | } else { |
124 | tc. m_font_family = font ( ). family ( ); | 125 | tc. m_font_family = font ( ). family ( ); |
125 | tc. m_font_size = font ( ). pointSize ( ); | 126 | tc. m_font_size = font ( ). pointSize ( ); |
127 | tc. m_font_style = "Regular"; | ||
126 | } | 128 | } |
127 | m_tabs [*it] = tc; | 129 | m_tabs [*it] = tc; |
128 | } | 130 | } |
129 | } | 131 | } |
130 | 132 | ||
131 | 133 | ||
132 | void TabsSettings::accept ( ) | 134 | void TabsSettings::accept ( ) |
133 | { | 135 | { |
@@ -153,17 +155,17 @@ void TabsSettings::accept ( ) | |||
153 | 155 | ||
154 | QCopEnvelope e ( "QPE/Launcher", "setTabView(QString,int)" ); | 156 | QCopEnvelope e ( "QPE/Launcher", "setTabView(QString,int)" ); |
155 | e << *it << tc. m_view; | 157 | e << *it << tc. m_view; |
156 | 158 | ||
157 | cfg. writeEntry ( "BackgroundImage", tc. m_bg_image ); | 159 | cfg. writeEntry ( "BackgroundImage", tc. m_bg_image ); |
158 | cfg. writeEntry ( "BackgroundColor", tc. m_bg_color ); | 160 | cfg. writeEntry ( "BackgroundColor", tc. m_bg_color ); |
159 | cfg. writeEntry ( "TextColor", tc. m_text_color ); | 161 | cfg. writeEntry ( "TextColor", tc. m_text_color ); |
160 | 162 | ||
161 | QString f = tc. m_font_family + "," + QString::number ( tc. m_font_size ) + ",50,0"; | 163 | QString f = tc. m_font_family + "," + QString::number ( tc. m_font_size ) + "," + tc. m_font_style + ",0"; |
162 | cfg. writeEntry ( "Font", f ); | 164 | cfg. writeEntry ( "Font", f ); |
163 | QCopEnvelope be ( "QPE/Launcher", "setTabBackground(QString,int,QString)" ); | 165 | QCopEnvelope be ( "QPE/Launcher", "setTabBackground(QString,int,QString)" ); |
164 | 166 | ||
165 | switch ( tc. m_bg_type ) { | 167 | switch ( tc. m_bg_type ) { |
166 | case TabConfig::Ruled: | 168 | case TabConfig::Ruled: |
167 | cfg.writeEntry( "BackgroundType", "Ruled" ); | 169 | cfg.writeEntry( "BackgroundType", "Ruled" ); |
168 | be << *it << tc. m_bg_type << QString(""); | 170 | be << *it << tc. m_bg_type << QString(""); |
169 | break; | 171 | break; |