Diffstat (limited to 'core/settings/launcher/tabssettings.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | core/settings/launcher/tabssettings.cpp | 4 |
1 files changed, 4 insertions, 0 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 | |||
@@ -149,48 +149,49 @@ void TabsSettings::readTabSettings ( Config &cfg ) | |||
149 | for ( QStringList::Iterator it = m_ids. begin ( ); it != m_ids. end ( ); ++it ) { | 149 | for ( QStringList::Iterator it = m_ids. begin ( ); it != m_ids. end ( ); ++it ) { |
150 | TabConfig tc = ( it != m_ids. begin ( )) ? m_tabs [GLOBALID] : global_def; | 150 | TabConfig tc = ( it != m_ids. begin ( )) ? m_tabs [GLOBALID] : global_def; |
151 | 151 | ||
152 | cfg. setGroup ( grp. arg ( *it )); | 152 | cfg. setGroup ( grp. arg ( *it )); |
153 | cfg2. setGroup( grp. arg ( *it )); | 153 | cfg2. setGroup( grp. arg ( *it )); |
154 | 154 | ||
155 | QString view = cfg. readEntry ( "View" ); | 155 | QString view = cfg. readEntry ( "View" ); |
156 | if ( view == "Icon" ) // No tr | 156 | if ( view == "Icon" ) // No tr |
157 | tc. m_view = TabConfig::Icon; | 157 | tc. m_view = TabConfig::Icon; |
158 | if ( view == "List" ) // No tr | 158 | if ( view == "List" ) // No tr |
159 | tc. m_view = TabConfig::List; | 159 | tc. m_view = TabConfig::List; |
160 | 160 | ||
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 | ||
185 | // if all tabs have the same config, then initialize the GLOBALID tab to these values | 186 | // if all tabs have the same config, then initialize the GLOBALID tab to these values |
186 | 187 | ||
187 | TabConfig *first = 0; | 188 | TabConfig *first = 0; |
188 | bool same = true; | 189 | bool same = true; |
189 | 190 | ||
190 | for ( QStringList::Iterator it = m_ids. begin ( ); it != m_ids. end ( ); ++it ) { | 191 | for ( QStringList::Iterator it = m_ids. begin ( ); it != m_ids. end ( ); ++it ) { |
191 | if ( *it == GLOBALID ) | 192 | if ( *it == GLOBALID ) |
192 | continue; | 193 | continue; |
193 | else if ( !first ) | 194 | else if ( !first ) |
194 | first = &m_tabs [*it]; | 195 | first = &m_tabs [*it]; |
195 | else | 196 | else |
196 | same &= ( *first == m_tabs [*it] ); | 197 | same &= ( *first == m_tabs [*it] ); |
@@ -242,48 +243,51 @@ void TabsSettings::accept ( ) | |||
242 | } | 243 | } |
243 | else | 244 | else |
244 | cfg. removeEntry ( "Font" ); | 245 | cfg. removeEntry ( "Font" ); |
245 | 246 | ||
246 | QCopEnvelope be ( "QPE/Launcher", "setTabBackground(QString,int,QString)" ); | 247 | QCopEnvelope be ( "QPE/Launcher", "setTabBackground(QString,int,QString)" ); |
247 | 248 | ||
248 | switch ( tc. m_bg_type ) { | 249 | switch ( tc. m_bg_type ) { |
249 | case TabConfig::Ruled: | 250 | case TabConfig::Ruled: |
250 | cfg.writeEntry( "BackgroundType", "Ruled" ); | 251 | cfg.writeEntry( "BackgroundType", "Ruled" ); |
251 | be << *it << tc. m_bg_type << QString(""); | 252 | be << *it << tc. m_bg_type << QString(""); |
252 | break; | 253 | break; |
253 | case TabConfig::SolidColor: | 254 | case TabConfig::SolidColor: |
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 | ||
267 | QCopEnvelope ic( "QPE/Launcher", "setIconColumns(QString,int)" ); | ||
268 | ic << *it << tc. m_iconcolumns; | ||
269 | |||
266 | QCopEnvelope fe ( "QPE/Launcher", "setFont(QString,QString,int,int,int)" ); | 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 | ||
279 | cfg. writeEntry ( "BigBusy", m_bigbusy->isChecked( ) ); | 283 | cfg. writeEntry ( "BigBusy", m_bigbusy->isChecked( ) ); |
280 | 284 | ||
281 | { | 285 | { |
282 | QCopEnvelope e ( "QPE/Launcher", "setBusyIndicatorType(QString)" ); | 286 | QCopEnvelope e ( "QPE/Launcher", "setBusyIndicatorType(QString)" ); |
283 | e << busytype; | 287 | e << busytype; |
284 | } | 288 | } |
285 | } | 289 | } |
286 | 290 | ||
287 | void TabsSettings::newClicked ( ) | 291 | void TabsSettings::newClicked ( ) |
288 | { | 292 | { |
289 | QMessageBox::information ( this, tr( "Error" ), tr( "Not implemented yet" )); | 293 | QMessageBox::information ( this, tr( "Error" ), tr( "Not implemented yet" )); |