-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 @@ -278,65 +278,65 @@ TabDialog::TabDialog ( const QPixmap *tabicon, const QString &tabname, TabConfig tw-> setCurrentTab ( bgtab ); QWidget *sample = new QVBox ( this ); QTabBar *tb = new QTabBar ( sample ); QString name ( tr( "Previewing %1" ). arg ( tabname )); tb-> addTab ( tabicon ? new QTab ( *tabicon, name ) : new QTab ( name )); m_sample = new SampleView ( sample ); lay-> addWidget ( tw, 10 ); lay-> addWidget ( sample, 1 ); m_iconsize-> setButton ( tc. m_view ); iconSizeClicked ( tc. m_view ); m_iconcolor-> setColor ( QColor ( m_tc. m_text_color )); iconColorClicked ( m_iconcolor-> color ( )); m_bgtype-> setButton ( tc. m_bg_type ); m_solidcolor-> setColor ( QColor ( tc. m_bg_color )); m_bgimage = tc. m_bg_image; bgTypeClicked ( tc. m_bg_type ); m_fontselect-> setSelectedFont ( QFont ( tc. m_font_family, tc. m_font_size, tc. m_font_weight, tc. m_font_italic )); fontClicked ( m_fontselect-> selectedFont ( )); } TabDialog::~TabDialog ( ) { } QWidget *TabDialog::createFontTab ( QWidget *parent ) { - m_fontselect = new OFontSelector ( parent, "FontTab" ); + m_fontselect = new OFontSelector ( false, parent, "FontTab" ); connect( m_fontselect, SIGNAL( fontSelected ( const QFont & )), this, SLOT( fontClicked ( const QFont & ))); return m_fontselect; } QWidget *TabDialog::createBgTab ( QWidget *parent ) { QWidget *tab = new QWidget( parent, "AdvancedTab" ); QVBoxLayout *vertLayout = new QVBoxLayout( tab, 4, 4 ); QGridLayout* gridLayout = new QGridLayout ( vertLayout ); gridLayout-> setColStretch ( 1, 10 ); QLabel* label = new QLabel( tr( "Type:" ), tab ); gridLayout-> addWidget ( label, 0, 0 ); m_bgtype = new QButtonGroup( tab, "buttongroup" ); m_bgtype-> hide ( ); m_bgtype-> setExclusive ( true ); QRadioButton *rb; rb = new QRadioButton( tr( "Ruled" ), tab, "ruled" ); m_bgtype-> insert ( rb, TabConfig::Ruled ); gridLayout-> addWidget( rb, 0, 1 ); QHBoxLayout *hb = new QHBoxLayout ( ); hb-> setSpacing ( 4 ); rb = new QRadioButton( tr( "Solid color" ), tab, "solid" ); m_bgtype-> insert ( rb, TabConfig::SolidColor ); hb-> addWidget ( rb ); 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 @@ -222,65 +222,65 @@ QWidget *Appearance::createDecoTab ( QWidget *parent ) Config config ( "qpe" ); config. setGroup ( "Appearance" ); QWidget* tab = new QWidget( parent, "DecoTab" ); QVBoxLayout* vertLayout = new QVBoxLayout( tab, 4, 4 ); m_deco_list = new QListBox( tab, "m_deco_list" ); vertLayout->addWidget( m_deco_list ); loadDecos ( m_deco_list ); QString s = config. readEntry ( "Decoration" ); m_deco_list-> setCurrentItem ( m_deco_list-> findItem ( s )); m_original_deco = m_deco_list-> currentItem ( ); if ( m_deco_list-> currentItem ( ) < 0 ) m_deco_list-> setCurrentItem ( 0 ); decoClicked ( m_original_deco ); connect( m_deco_list, SIGNAL( highlighted( int ) ), this, SLOT( decoClicked( int ) ) ); return tab; } QWidget *Appearance::createFontTab ( QWidget *parent ) { Config config ( "qpe" ); config. setGroup ( "Appearance" ); QString familyStr = config.readEntry( "FontFamily", "Helvetica" ); QString styleStr = config.readEntry( "FontStyle", "Regular" ); int size = config.readNumEntry( "FontSize", 10 ); - m_fontselect = new OFontSelector ( parent, "FontTab" ); + m_fontselect = new OFontSelector ( false, parent, "FontTab" ); m_fontselect-> setSelectedFont ( familyStr, styleStr, size ); connect( m_fontselect, SIGNAL( fontSelected ( const QFont & )), this, SLOT( fontClicked ( const QFont & ))); return m_fontselect; } QWidget *Appearance::createColorTab ( QWidget *parent ) { Config config ( "qpe" ); config. setGroup ( "Appearance" ); QWidget *tab = new QWidget( parent, "ColorTab" ); QGridLayout *gridLayout = new QGridLayout( tab, 0, 0, 4, 4 ); gridLayout->setRowStretch ( 3, 10 ); m_color_list = new QListBox ( tab ); gridLayout->addMultiCellWidget ( m_color_list, 0, 3, 0, 0 ); connect( m_color_list, SIGNAL( highlighted( int ) ), this, SLOT( colorClicked( int ) ) ); loadColors ( m_color_list ); m_color_list-> setCurrentItem ( 0 ); QPushButton* tempButton = new QPushButton( tab, "editSchemeButton" ); tempButton->setText( tr( "Edit..." ) ); connect( tempButton, SIGNAL( clicked() ), this, SLOT( editSchemeClicked() ) ); gridLayout->addWidget( tempButton, 0, 1 ); tempButton = new QPushButton( tab, "deleteSchemeButton" ); tempButton->setText( tr( "Delete" ) ); |