Diffstat (limited to 'core/settings/launcher/tabssettings.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | core/settings/launcher/tabssettings.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/core/settings/launcher/tabssettings.cpp b/core/settings/launcher/tabssettings.cpp index e5a7087..5ac625b 100644 --- a/core/settings/launcher/tabssettings.cpp +++ b/core/settings/launcher/tabssettings.cpp | |||
@@ -134,45 +134,48 @@ void TabsSettings::readTabSettings ( Config &cfg ) | |||
134 | global_def. m_view = TabConfig::Icon; | 134 | global_def. m_view = TabConfig::Icon; |
135 | global_def. m_bg_type = TabConfig::Ruled; | 135 | global_def. m_bg_type = TabConfig::Ruled; |
136 | global_def. m_bg_image = "launcher/opie-background"; | 136 | global_def. m_bg_image = "launcher/opie-background"; |
137 | global_def. m_bg_color = colorGroup ( ). color ( QColorGroup::Base ). name ( ); | 137 | global_def. m_bg_color = colorGroup ( ). color ( QColorGroup::Base ). name ( ); |
138 | global_def. m_text_color = colorGroup ( ). color ( QColorGroup::Text ). name ( ); | 138 | global_def. m_text_color = colorGroup ( ). color ( QColorGroup::Text ). name ( ); |
139 | global_def. m_font_use = false; | 139 | global_def. m_font_use = false; |
140 | global_def. m_font_family = font ( ). family ( ); | 140 | global_def. m_font_family = font ( ). family ( ); |
141 | global_def. m_font_size = font ( ). pointSize ( ); | 141 | global_def. m_font_size = font ( ). pointSize ( ); |
142 | global_def. m_font_weight = 50; | 142 | global_def. m_font_weight = 50; |
143 | global_def. m_font_italic = false; | 143 | global_def. m_font_italic = false; |
144 | global_def. m_changed = false; | 144 | global_def. m_changed = false; |
145 | 145 | ||
146 | Config cfg2 = Config( "Launchersettings" ); | ||
146 | 147 | ||
147 | for ( QStringList::Iterator it = m_ids. begin ( ); it != m_ids. end ( ); ++it ) { | 148 | for ( QStringList::Iterator it = m_ids. begin ( ); it != m_ids. end ( ); ++it ) { |
148 | TabConfig tc = ( it != m_ids. begin ( )) ? m_tabs [GLOBALID] : global_def; | 149 | TabConfig tc = ( it != m_ids. begin ( )) ? m_tabs [GLOBALID] : global_def; |
149 | 150 | ||
150 | cfg. setGroup ( grp. arg ( *it )); | 151 | cfg. setGroup ( grp. arg ( *it )); |
152 | cfg2. setGroup( grp. arg ( *it )); | ||
151 | 153 | ||
152 | QString view = cfg. readEntry ( "View" ); | 154 | QString view = cfg. readEntry ( "View" ); |
153 | if ( view == "Icon" ) // No tr | 155 | if ( view == "Icon" ) // No tr |
154 | tc. m_view = TabConfig::Icon; | 156 | tc. m_view = TabConfig::Icon; |
155 | if ( view == "List" ) // No tr | 157 | if ( view == "List" ) // No tr |
156 | tc. m_view = TabConfig::List; | 158 | tc. m_view = TabConfig::List; |
157 | 159 | ||
158 | QString bgType = cfg. readEntry ( "BackgroundType" ); | 160 | QString bgType = cfg. readEntry ( "BackgroundType" ); |
159 | if ( bgType == "Image" ) | 161 | if ( bgType == "Image" ) |
160 | tc. m_bg_type = TabConfig::Image; | 162 | tc. m_bg_type = TabConfig::Image; |
161 | else if ( bgType == "SolidColor" ) | 163 | else if ( bgType == "SolidColor" ) |
162 | tc. m_bg_type = TabConfig::SolidColor; | 164 | tc. m_bg_type = TabConfig::SolidColor; |
163 | else if ( bgType == "Image" ) // No tr | 165 | else if ( bgType == "Image" ) // No tr |
164 | tc. m_bg_type = TabConfig::Image; | 166 | tc. m_bg_type = TabConfig::Image; |
165 | 167 | ||
166 | tc. m_bg_image = cfg. readEntry ( "BackgroundImage", tc. m_bg_image ); | 168 | tc. m_bg_image = cfg. readEntry ( "BackgroundImage", tc. m_bg_image ); |
169 | tc. m_last_directory = cfg2.readEntry( "DefaultDir", "" ); | ||
167 | tc. m_bg_color = cfg. readEntry ( "BackgroundColor", tc. m_bg_color ); | 170 | tc. m_bg_color = cfg. readEntry ( "BackgroundColor", tc. m_bg_color ); |
168 | tc. m_text_color = cfg. readEntry ( "TextColor", tc. m_text_color ); | 171 | tc. m_text_color = cfg. readEntry ( "TextColor", tc. m_text_color ); |
169 | QStringList f = cfg. readListEntry ( "Font", ',' ); | 172 | QStringList f = cfg. readListEntry ( "Font", ',' ); |
170 | if ( f. count ( ) == 4 ) { | 173 | if ( f. count ( ) == 4 ) { |
171 | tc. m_font_use = true; | 174 | tc. m_font_use = true; |
172 | tc. m_font_family = f [0]; | 175 | tc. m_font_family = f [0]; |
173 | tc. m_font_size = f [1]. toInt ( ); | 176 | tc. m_font_size = f [1]. toInt ( ); |
174 | tc. m_font_weight = f [2]. toInt ( ); | 177 | tc. m_font_weight = f [2]. toInt ( ); |
175 | tc. m_font_italic = ( f [3]. toInt ( )); | 178 | tc. m_font_italic = ( f [3]. toInt ( )); |
176 | } | 179 | } |
177 | m_tabs [*it] = tc; | 180 | m_tabs [*it] = tc; |
178 | } | 181 | } |
@@ -191,50 +194,53 @@ void TabsSettings::readTabSettings ( Config &cfg ) | |||
191 | same &= ( *first == m_tabs [*it] ); | 194 | same &= ( *first == m_tabs [*it] ); |
192 | } | 195 | } |
193 | if ( same ) { | 196 | if ( same ) { |
194 | m_tabs [GLOBALID] = *first; | 197 | m_tabs [GLOBALID] = *first; |
195 | m_tabs [GLOBALID]. m_changed = true; | 198 | m_tabs [GLOBALID]. m_changed = true; |
196 | } | 199 | } |
197 | } | 200 | } |
198 | 201 | ||
199 | 202 | ||
200 | void TabsSettings::accept ( ) | 203 | void TabsSettings::accept ( ) |
201 | { | 204 | { |
202 | Config cfg ( "Launcher" ); | 205 | Config cfg ( "Launcher" ); |
206 | Config cfg2 ( "Launchersettings" ); | ||
203 | 207 | ||
204 | // Launcher Tab | 208 | // Launcher Tab |
205 | QString grp ( "Tab %1" ); // No tr | 209 | QString grp ( "Tab %1" ); // No tr |
206 | 210 | ||
207 | for ( QStringList::Iterator it = m_ids. begin ( ); it != m_ids. end ( ); ++it ) { | 211 | for ( QStringList::Iterator it = m_ids. begin ( ); it != m_ids. end ( ); ++it ) { |
208 | TabConfig &tc = m_tabs [*it]; | 212 | TabConfig &tc = m_tabs [*it]; |
209 | 213 | ||
210 | if ( !tc. m_changed ) | 214 | if ( !tc. m_changed ) |
211 | continue; | 215 | continue; |
212 | 216 | ||
213 | cfg. setGroup ( grp. arg ( *it )); | 217 | cfg. setGroup ( grp. arg ( *it )); |
218 | cfg2. setGroup ( grp. arg ( *it )); | ||
214 | switch ( tc. m_view ) { | 219 | switch ( tc. m_view ) { |
215 | case TabConfig::Icon: | 220 | case TabConfig::Icon: |
216 | cfg.writeEntry ( "View", "Icon" ); | 221 | cfg.writeEntry ( "View", "Icon" ); |
217 | break; | 222 | break; |
218 | case TabConfig::List: | 223 | case TabConfig::List: |
219 | cfg.writeEntry ( "View", "List" ); | 224 | cfg.writeEntry ( "View", "List" ); |
220 | break; | 225 | break; |
221 | } | 226 | } |
222 | 227 | ||
223 | QCopEnvelope e ( "QPE/Launcher", "setTabView(QString,int)" ); | 228 | QCopEnvelope e ( "QPE/Launcher", "setTabView(QString,int)" ); |
224 | e << *it << tc. m_view; | 229 | e << *it << tc. m_view; |
225 | 230 | ||
226 | cfg. writeEntry ( "BackgroundImage", tc. m_bg_image ); | 231 | cfg. writeEntry ( "BackgroundImage", tc. m_bg_image ); |
227 | cfg. writeEntry ( "BackgroundColor", tc. m_bg_color ); | 232 | cfg. writeEntry ( "BackgroundColor", tc. m_bg_color ); |
228 | cfg. writeEntry ( "TextColor", tc. m_text_color ); | 233 | cfg. writeEntry ( "TextColor", tc. m_text_color ); |
234 | cfg2. writeEntry ( "DefaultDir", tc.m_last_directory ); | ||
229 | 235 | ||
230 | if ( tc. m_font_use ) { | 236 | if ( tc. m_font_use ) { |
231 | QString f = tc. m_font_family + "," + QString::number ( tc. m_font_size ) + "," + QString::number ( tc. m_font_weight ) + "," + ( tc. m_font_italic ? "1" : "0" ); | 237 | QString f = tc. m_font_family + "," + QString::number ( tc. m_font_size ) + "," + QString::number ( tc. m_font_weight ) + "," + ( tc. m_font_italic ? "1" : "0" ); |
232 | cfg. writeEntry ( "Font", f ); | 238 | cfg. writeEntry ( "Font", f ); |
233 | } | 239 | } |
234 | else | 240 | else |
235 | cfg. removeEntry ( "Font" ); | 241 | cfg. removeEntry ( "Font" ); |
236 | 242 | ||
237 | QCopEnvelope be ( "QPE/Launcher", "setTabBackground(QString,int,QString)" ); | 243 | QCopEnvelope be ( "QPE/Launcher", "setTabBackground(QString,int,QString)" ); |
238 | 244 | ||
239 | switch ( tc. m_bg_type ) { | 245 | switch ( tc. m_bg_type ) { |
240 | case TabConfig::Ruled: | 246 | case TabConfig::Ruled: |