author | mickeyl <mickeyl> | 2005-01-11 17:32:06 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2005-01-11 17:32:06 (UTC) |
commit | f8fd8556da5649f54af740a5dbb9a8c1ead2bcfc (patch) (unidiff) | |
tree | db41b30ad733fc476746e1a9c7576a5a083240fa /core/settings/launcher/tabssettings.cpp | |
parent | f82173157bdba4fa99afde9cc999bfe9b511ce07 (diff) | |
download | opie-f8fd8556da5649f54af740a5dbb9a8c1ead2bcfc.zip opie-f8fd8556da5649f54af740a5dbb9a8c1ead2bcfc.tar.gz opie-f8fd8556da5649f54af740a5dbb9a8c1ead2bcfc.tar.bz2 |
finish per-tab column setting. it now works on the fly and is persistent
Diffstat (limited to 'core/settings/launcher/tabssettings.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/settings/launcher/tabssettings.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/core/settings/launcher/tabssettings.cpp b/core/settings/launcher/tabssettings.cpp index ab64331..42f0568 100644 --- a/core/settings/launcher/tabssettings.cpp +++ b/core/settings/launcher/tabssettings.cpp | |||
@@ -161,24 +161,25 @@ void TabsSettings::readTabSettings ( Config &cfg ) | |||
161 | QString bgType = cfg. readEntry ( "BackgroundType" ); | 161 | QString bgType = cfg. readEntry ( "BackgroundType" ); |
162 | if ( bgType == "Image" ) | 162 | if ( bgType == "Image" ) |
163 | tc. m_bg_type = TabConfig::Image; | 163 | tc. m_bg_type = TabConfig::Image; |
164 | else if ( bgType == "SolidColor" ) | 164 | else if ( bgType == "SolidColor" ) |
165 | tc. m_bg_type = TabConfig::SolidColor; | 165 | tc. m_bg_type = TabConfig::SolidColor; |
166 | else if ( bgType == "Image" ) // No tr | 166 | else if ( bgType == "Image" ) // No tr |
167 | tc. m_bg_type = TabConfig::Image; | 167 | tc. m_bg_type = TabConfig::Image; |
168 | 168 | ||
169 | tc. m_bg_image = cfg. readEntry ( "BackgroundImage", tc. m_bg_image ); | 169 | tc. m_bg_image = cfg. readEntry ( "BackgroundImage", tc. m_bg_image ); |
170 | tc. m_last_directory = cfg2.readEntry( "DefaultDir", "" ); | 170 | tc. m_last_directory = cfg2.readEntry( "DefaultDir", "" ); |
171 | tc. m_bg_color = cfg. readEntry ( "BackgroundColor", tc. m_bg_color ); | 171 | tc. m_bg_color = cfg. readEntry ( "BackgroundColor", tc. m_bg_color ); |
172 | tc. m_iconcolumns = cfg. readNumEntry ( "Columns", tc. m_iconcolumns ); | 172 | tc. m_iconcolumns = cfg. readNumEntry ( "Columns", tc. m_iconcolumns ); |
173 | qDebug( "m_iconcolumns for %s = %d", (const char*) *it, tc.m_iconcolumns ); | ||
173 | tc. m_text_color = cfg. readEntry ( "TextColor", tc. m_text_color ); | 174 | tc. m_text_color = cfg. readEntry ( "TextColor", tc. m_text_color ); |
174 | QStringList f = cfg. readListEntry ( "Font", ',' ); | 175 | QStringList f = cfg. readListEntry ( "Font", ',' ); |
175 | if ( f. count ( ) == 4 ) { | 176 | if ( f. count ( ) == 4 ) { |
176 | tc. m_font_use = true; | 177 | tc. m_font_use = true; |
177 | tc. m_font_family = f [0]; | 178 | tc. m_font_family = f [0]; |
178 | tc. m_font_size = f [1]. toInt ( ); | 179 | tc. m_font_size = f [1]. toInt ( ); |
179 | tc. m_font_weight = f [2]. toInt ( ); | 180 | tc. m_font_weight = f [2]. toInt ( ); |
180 | tc. m_font_italic = ( f [3]. toInt ( )); | 181 | tc. m_font_italic = ( f [3]. toInt ( )); |
181 | } | 182 | } |
182 | m_tabs [*it] = tc; | 183 | m_tabs [*it] = tc; |
183 | } | 184 | } |
184 | 185 | ||
@@ -254,25 +255,28 @@ void TabsSettings::accept ( ) | |||
254 | cfg.writeEntry( "BackgroundType", "SolidColor" ); | 255 | cfg.writeEntry( "BackgroundType", "SolidColor" ); |
255 | be << *it << tc. m_bg_type << tc. m_bg_color; | 256 | be << *it << tc. m_bg_type << tc. m_bg_color; |
256 | break; | 257 | break; |
257 | case TabConfig::Image: | 258 | case TabConfig::Image: |
258 | cfg.writeEntry( "BackgroundType", "Image" ); | 259 | cfg.writeEntry( "BackgroundType", "Image" ); |
259 | be << *it << tc. m_bg_type << tc. m_bg_image; | 260 | be << *it << tc. m_bg_type << tc. m_bg_image; |
260 | break; | 261 | break; |
261 | } | 262 | } |
262 | 263 | ||
263 | QCopEnvelope te( "QPE/Launcher", "setTextColor(QString,QString)" ); | 264 | QCopEnvelope te( "QPE/Launcher", "setTextColor(QString,QString)" ); |
264 | te << *it << tc. m_text_color; | 265 | te << *it << tc. m_text_color; |
265 | 266 | ||
266 | QCopEnvelope fe ( "QPE/Launcher", "setFont(QString,QString,int,int,int)" ); | 267 | QCopEnvelope ic( "QPE/Launcher", "setIconColumns(QString,int)" ); |
268 | ic << *it << tc. m_iconcolumns; | ||
269 | |||
270 | QCopEnvelope fe ( "QPE/Launcher", "setFont(QString,QString,int,int,int)" ); | ||
267 | fe << *it; | 271 | fe << *it; |
268 | fe << ( tc. m_font_use ? tc. m_font_family : QString::null ); | 272 | fe << ( tc. m_font_use ? tc. m_font_family : QString::null ); |
269 | fe << tc. m_font_size; | 273 | fe << tc. m_font_size; |
270 | fe << tc. m_font_weight; | 274 | fe << tc. m_font_weight; |
271 | fe << ( tc. m_font_italic ? 1 : 0 ); | 275 | fe << ( tc. m_font_italic ? 1 : 0 ); |
272 | 276 | ||
273 | tc. m_changed = false; | 277 | tc. m_changed = false; |
274 | } | 278 | } |
275 | cfg. setGroup ( "GUI" ); | 279 | cfg. setGroup ( "GUI" ); |
276 | QString busytype = QString ( m_busyani-> isChecked ( ) ? "Animated" : "" ); | 280 | QString busytype = QString ( m_busyani-> isChecked ( ) ? "Animated" : "" ); |
277 | cfg. writeEntry ( "BusyType", busytype ); | 281 | cfg. writeEntry ( "BusyType", busytype ); |
278 | 282 | ||