author | sandman <sandman> | 2002-09-25 23:11:05 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-09-25 23:11:05 (UTC) |
commit | 0c6ce9f1600bf1efb7736f87fd14dd8215db851f (patch) (side-by-side diff) | |
tree | 13d1367dc79a64d44ef83f57259e04a0be099f8c /core/settings | |
parent | bdbd20a9a0415e2284e21923ed03d4ca3f6615e8 (diff) | |
download | opie-0c6ce9f1600bf1efb7736f87fd14dd8215db851f.zip opie-0c6ce9f1600bf1efb7736f87fd14dd8215db851f.tar.gz opie-0c6ce9f1600bf1efb7736f87fd14dd8215db851f.tar.bz2 |
load and save of tab settings works now -- bg image still missing
-rw-r--r-- | core/settings/launcher/tabconfig.h | 1 | ||||
-rw-r--r-- | core/settings/launcher/tabdialog.cpp | 34 | ||||
-rw-r--r-- | core/settings/launcher/tabdialog.h | 5 | ||||
-rw-r--r-- | core/settings/launcher/tabssettings.cpp | 4 |
4 files changed, 32 insertions, 12 deletions
diff --git a/core/settings/launcher/tabconfig.h b/core/settings/launcher/tabconfig.h index 52ae81f..8f21eb4 100644 --- a/core/settings/launcher/tabconfig.h +++ b/core/settings/launcher/tabconfig.h @@ -17,8 +17,9 @@ struct TabConfig { QString m_bg_image; QString m_bg_color; QString m_text_color; QString m_font_family; + QString m_font_style; int m_font_size; bool m_changed; }; diff --git a/core/settings/launcher/tabdialog.cpp b/core/settings/launcher/tabdialog.cpp index 7b01cc7..ca48e66 100644 --- a/core/settings/launcher/tabdialog.cpp +++ b/core/settings/launcher/tabdialog.cpp @@ -223,9 +223,9 @@ private: TabDialog::TabDialog ( const QPixmap *tabicon, const QString &tabname, TabConfig &tc, QWidget *parent, const char *name, bool modal, WFlags fl ) - : QDialog ( parent, name, modal, fl ) + : QDialog ( parent, name, modal, fl ), m_tc ( tc ) { setCaption ( tr( "Edit Tab" )); QVBoxLayout *lay = new QVBoxLayout ( this, 4, 4 ); @@ -248,8 +248,16 @@ TabDialog::TabDialog ( const QPixmap *tabicon, const QString &tabname, TabConfig m_sample = new SampleView ( sample ); lay-> addWidget ( tw, 10 ); lay-> addWidget ( sample, 1 ); + + m_iconsize-> setButton ( tc. m_view ); + iconSizeClicked ( tc. m_view ); + m_bgtype-> setButton ( tc. m_bg_type ); + m_solidcolor-> setColor ( QColor ( tc. m_bg_color )); + bgTypeClicked ( tc. m_bg_type ); + m_fontselect-> setSelectedFont ( tc. m_font_family, tc. m_font_style, tc. m_font_size ); + fontClicked ( m_fontselect-> selectedFont ( )); } TabDialog::~TabDialog ( ) @@ -257,17 +265,9 @@ TabDialog::~TabDialog ( ) } QWidget *TabDialog::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-> setSelectedFont ( familyStr, styleStr, size ); connect( m_fontselect, SIGNAL( fontSelected ( const QFont & )), this, SLOT( fontClicked ( const QFont & ))); @@ -298,21 +298,21 @@ QWidget *TabDialog::createBgTab ( QWidget *parent ) rb = new QRadioButton( tr( "Solid color" ), tab, "solid" ); m_bgtype-> insert ( rb, TabConfig::SolidColor ); hb-> addWidget ( rb ); + hb-> addSpacing ( 10 ); m_solidcolor = new OColorButton ( tab ); connect ( m_solidcolor, SIGNAL( colorSelected ( const QColor & )), this, SLOT( colorClicked ( const QColor & ))); hb-> addWidget ( m_solidcolor ); - hb-> addStretch ( 10 ); gridLayout-> addLayout ( hb, 1, 1 ); rb = new QRadioButton( tr( "Image" ), tab, "image" ); m_bgtype-> insert ( rb, TabConfig::Image ); gridLayout-> addWidget( rb, 3, 1 ); - QPushButton *p; +// QPushButton *p; connect ( m_bgtype, SIGNAL( clicked ( int )), this, SLOT( bgTypeClicked ( int ))); vertLayout-> addStretch ( 10 ); @@ -378,4 +378,16 @@ void TabDialog::bgTypeClicked ( int t ) void TabDialog::colorClicked ( const QColor &col ) { m_sample-> setBackgroundType ( TabConfig::SolidColor, col. name ( )); } + +void TabDialog::accept ( ) +{ + m_tc. m_view = (TabConfig::ViewMode) m_iconsize-> id ( m_iconsize-> selected ( )); + m_tc. m_bg_type = (TabConfig::BackgroundType) m_bgtype-> id ( m_bgtype-> selected ( )); + m_tc. m_bg_color = m_solidcolor-> color ( ). name ( ); + m_tc. m_font_family = m_fontselect-> fontFamily ( ); + m_tc. m_font_size = m_fontselect-> fontSize ( ); + m_tc. m_font_style = m_fontselect-> fontStyle ( ); + + QDialog::accept ( ); +} diff --git a/core/settings/launcher/tabdialog.h b/core/settings/launcher/tabdialog.h index d602573..e1935fd 100644 --- a/core/settings/launcher/tabdialog.h +++ b/core/settings/launcher/tabdialog.h @@ -14,8 +14,11 @@ class TabDialog : public QDialog { public: TabDialog ( const QPixmap *tabicon, const QString &tabname, TabConfig &cfg, QWidget *parent = 0, const char *name = 0, bool modal = false, WFlags = 0 ); virtual ~TabDialog ( ); +public slots: + virtual void accept ( ); + protected slots: void iconSizeClicked ( int ); void fontClicked ( const QFont & ); void bgTypeClicked ( int ); @@ -33,8 +36,10 @@ private: OFontSelector *m_fontselect; OColorButton *m_solidcolor; QButtonGroup *m_bgtype; + + TabConfig &m_tc; }; #endif
\ No newline at end of file diff --git a/core/settings/launcher/tabssettings.cpp b/core/settings/launcher/tabssettings.cpp index fc2d2c9..ae78733 100644 --- a/core/settings/launcher/tabssettings.cpp +++ b/core/settings/launcher/tabssettings.cpp @@ -119,11 +119,13 @@ void TabsSettings::readTabSettings ( ) QStringList f = cfg. readListEntry ( "Font", ',' ); if ( f. count ( ) == 4 ) { tc. m_font_family = f [0]; tc. m_font_size = f [1]. toInt ( ); + tc. m_font_style = f [2]; } else { tc. m_font_family = font ( ). family ( ); tc. m_font_size = font ( ). pointSize ( ); + tc. m_font_style = "Regular"; } m_tabs [*it] = tc; } } @@ -157,9 +159,9 @@ void TabsSettings::accept ( ) cfg. writeEntry ( "BackgroundImage", tc. m_bg_image ); cfg. writeEntry ( "BackgroundColor", tc. m_bg_color ); cfg. writeEntry ( "TextColor", tc. m_text_color ); - QString f = tc. m_font_family + "," + QString::number ( tc. m_font_size ) + ",50,0"; + QString f = tc. m_font_family + "," + QString::number ( tc. m_font_size ) + "," + tc. m_font_style + ",0"; cfg. writeEntry ( "Font", f ); QCopEnvelope be ( "QPE/Launcher", "setTabBackground(QString,int,QString)" ); switch ( tc. m_bg_type ) { |