load and save of tab settings works now -- bg image still missing

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
@@ -20,2 +20,3 @@ struct TabConfig {
 	QString        m_font_family;
+	QString        m_font_style;
 	int            m_font_size;
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
@@ -226,3 +226,3 @@ 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 )
 {
@@ -251,2 +251,10 @@ TabDialog::TabDialog ( const QPixmap *tabicon, const QString &tabname, TabConfig
 	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 ( ));
 }
@@ -260,11 +268,3 @@ 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 );
     
@@ -301,2 +301,3 @@ QWidget *TabDialog::createBgTab ( QWidget *parent )
     hb-> addWidget ( rb );
+	hb-> addSpacing ( 10 );
     
@@ -305,3 +306,2 @@ QWidget *TabDialog::createBgTab ( QWidget *parent )
 	hb-> addWidget ( m_solidcolor );
-	hb-> addStretch ( 10 );
 
@@ -313,3 +313,3 @@ QWidget *TabDialog::createBgTab ( QWidget *parent )
 
-	QPushButton *p;
+//	QPushButton *p;
 
@@ -381 +381,13 @@ void TabDialog::colorClicked ( const QColor &col )
 }
+
+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
@@ -17,2 +17,5 @@ public:
 
+public slots:
+	virtual void accept ( );
+
 protected slots:
@@ -36,2 +39,4 @@ private:
 	QButtonGroup *m_bgtype;
+	
+	TabConfig &m_tc;
 };
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
@@ -122,2 +122,3 @@ void TabsSettings::readTabSettings ( )
 			tc. m_font_size = f [1]. toInt ( );
+			tc. m_font_style = f [2];
 		} else {
@@ -125,2 +126,3 @@ void TabsSettings::readTabSettings ( )
 			tc. m_font_size = font ( ). pointSize ( );
+			tc. m_font_style = "Regular";
 		}
@@ -160,3 +162,3 @@ void TabsSettings::accept ( )
 
-		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 );