-rw-r--r-- | core/settings/launcher/tabdialog.cpp | 2 | ||||
-rw-r--r-- | noncore/settings/appearance2/appearance.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/settings/launcher/tabdialog.cpp b/core/settings/launcher/tabdialog.cpp index 75a3de5..6288f5f 100644 --- a/core/settings/launcher/tabdialog.cpp +++ b/core/settings/launcher/tabdialog.cpp | |||
@@ -294,33 +294,33 @@ TabDialog::TabDialog ( const QPixmap *tabicon, const QString &tabname, TabConfig | |||
294 | iconColorClicked ( m_iconcolor-> color ( )); | 294 | iconColorClicked ( m_iconcolor-> color ( )); |
295 | m_bgtype-> setButton ( tc. m_bg_type ); | 295 | m_bgtype-> setButton ( tc. m_bg_type ); |
296 | m_solidcolor-> setColor ( QColor ( tc. m_bg_color )); | 296 | m_solidcolor-> setColor ( QColor ( tc. m_bg_color )); |
297 | m_bgimage = tc. m_bg_image; | 297 | m_bgimage = tc. m_bg_image; |
298 | bgTypeClicked ( tc. m_bg_type ); | 298 | bgTypeClicked ( tc. m_bg_type ); |
299 | m_fontselect-> setSelectedFont ( QFont ( tc. m_font_family, tc. m_font_size, tc. m_font_weight, tc. m_font_italic )); | 299 | m_fontselect-> setSelectedFont ( QFont ( tc. m_font_family, tc. m_font_size, tc. m_font_weight, tc. m_font_italic )); |
300 | fontClicked ( m_fontselect-> selectedFont ( )); | 300 | fontClicked ( m_fontselect-> selectedFont ( )); |
301 | } | 301 | } |
302 | 302 | ||
303 | 303 | ||
304 | TabDialog::~TabDialog ( ) | 304 | TabDialog::~TabDialog ( ) |
305 | { | 305 | { |
306 | } | 306 | } |
307 | 307 | ||
308 | QWidget *TabDialog::createFontTab ( QWidget *parent ) | 308 | QWidget *TabDialog::createFontTab ( QWidget *parent ) |
309 | { | 309 | { |
310 | m_fontselect = new OFontSelector ( parent, "FontTab" ); | 310 | m_fontselect = new OFontSelector ( false, parent, "FontTab" ); |
311 | 311 | ||
312 | connect( m_fontselect, SIGNAL( fontSelected ( const QFont & )), | 312 | connect( m_fontselect, SIGNAL( fontSelected ( const QFont & )), |
313 | this, SLOT( fontClicked ( const QFont & ))); | 313 | this, SLOT( fontClicked ( const QFont & ))); |
314 | 314 | ||
315 | return m_fontselect; | 315 | return m_fontselect; |
316 | } | 316 | } |
317 | 317 | ||
318 | QWidget *TabDialog::createBgTab ( QWidget *parent ) | 318 | QWidget *TabDialog::createBgTab ( QWidget *parent ) |
319 | { | 319 | { |
320 | QWidget *tab = new QWidget( parent, "AdvancedTab" ); | 320 | QWidget *tab = new QWidget( parent, "AdvancedTab" ); |
321 | QVBoxLayout *vertLayout = new QVBoxLayout( tab, 4, 4 ); | 321 | QVBoxLayout *vertLayout = new QVBoxLayout( tab, 4, 4 ); |
322 | 322 | ||
323 | QGridLayout* gridLayout = new QGridLayout ( vertLayout ); | 323 | QGridLayout* gridLayout = new QGridLayout ( vertLayout ); |
324 | gridLayout-> setColStretch ( 1, 10 ); | 324 | gridLayout-> setColStretch ( 1, 10 ); |
325 | 325 | ||
326 | QLabel* label = new QLabel( tr( "Type:" ), tab ); | 326 | QLabel* label = new QLabel( tr( "Type:" ), tab ); |
diff --git a/noncore/settings/appearance2/appearance.cpp b/noncore/settings/appearance2/appearance.cpp index a5d216c..e269aec 100644 --- a/noncore/settings/appearance2/appearance.cpp +++ b/noncore/settings/appearance2/appearance.cpp | |||
@@ -238,33 +238,33 @@ QWidget *Appearance::createDecoTab ( QWidget *parent ) | |||
238 | decoClicked ( m_original_deco ); | 238 | decoClicked ( m_original_deco ); |
239 | 239 | ||
240 | connect( m_deco_list, SIGNAL( highlighted( int ) ), this, SLOT( decoClicked( int ) ) ); | 240 | connect( m_deco_list, SIGNAL( highlighted( int ) ), this, SLOT( decoClicked( int ) ) ); |
241 | 241 | ||
242 | return tab; | 242 | return tab; |
243 | } | 243 | } |
244 | 244 | ||
245 | QWidget *Appearance::createFontTab ( QWidget *parent ) | 245 | QWidget *Appearance::createFontTab ( QWidget *parent ) |
246 | { | 246 | { |
247 | Config config ( "qpe" ); | 247 | Config config ( "qpe" ); |
248 | config. setGroup ( "Appearance" ); | 248 | config. setGroup ( "Appearance" ); |
249 | 249 | ||
250 | QString familyStr = config.readEntry( "FontFamily", "Helvetica" ); | 250 | QString familyStr = config.readEntry( "FontFamily", "Helvetica" ); |
251 | QString styleStr = config.readEntry( "FontStyle", "Regular" ); | 251 | QString styleStr = config.readEntry( "FontStyle", "Regular" ); |
252 | int size = config.readNumEntry( "FontSize", 10 ); | 252 | int size = config.readNumEntry( "FontSize", 10 ); |
253 | 253 | ||
254 | m_fontselect = new OFontSelector ( parent, "FontTab" ); | 254 | m_fontselect = new OFontSelector ( false, parent, "FontTab" ); |
255 | m_fontselect-> setSelectedFont ( familyStr, styleStr, size ); | 255 | m_fontselect-> setSelectedFont ( familyStr, styleStr, size ); |
256 | 256 | ||
257 | connect( m_fontselect, SIGNAL( fontSelected ( const QFont & )), | 257 | connect( m_fontselect, SIGNAL( fontSelected ( const QFont & )), |
258 | this, SLOT( fontClicked ( const QFont & ))); | 258 | this, SLOT( fontClicked ( const QFont & ))); |
259 | 259 | ||
260 | return m_fontselect; | 260 | return m_fontselect; |
261 | } | 261 | } |
262 | 262 | ||
263 | QWidget *Appearance::createColorTab ( QWidget *parent ) | 263 | QWidget *Appearance::createColorTab ( QWidget *parent ) |
264 | { | 264 | { |
265 | Config config ( "qpe" ); | 265 | Config config ( "qpe" ); |
266 | config. setGroup ( "Appearance" ); | 266 | config. setGroup ( "Appearance" ); |
267 | 267 | ||
268 | 268 | ||
269 | QWidget *tab = new QWidget( parent, "ColorTab" ); | 269 | QWidget *tab = new QWidget( parent, "ColorTab" ); |
270 | QGridLayout *gridLayout = new QGridLayout( tab, 0, 0, 4, 4 ); | 270 | QGridLayout *gridLayout = new QGridLayout( tab, 0, 0, 4, 4 ); |