Fix default settings for background in Edit tab dialog

1 files changed, 16 insertions, 26 deletions

diff --git a/core/settings/launcher/tabdialog.cpp b/core/settings/launcher/tabdialog.cpp
index bd51628..555e64e 100644
--- a/core/settings/launcher/tabdialog.cpp
+++ b/core/settings/launcher/tabdialog.cpp
@@ -161,12 +161,5 @@ public:
                 odebug << "Loading image: " << val << "" << oendl;
-                QPixmap bg ( Resource::loadPixmap ( "wallpaper/" + val ));
-                if ( bg. isNull ( )) {
-                    QImageIO imgio;
-                    imgio. setFileName ( val );
-                    QSize ds = qApp-> desktop ( )-> size ( );
-                    QString param ( "Scale( %1, %2, ScaleMin )" ); // No tr
-                    imgio. setParameters ( param. arg ( ds. width ( )). arg ( ds. height ( )). latin1 ( ));
-                    imgio. read ( );
-                    bg = imgio. image ( );
-                }
+                QPixmap bg = Resource::loadPixmap ( val );
+                if ( bg. isNull () )
+                    bg = QPixmap( val );
                 setBackgroundPixmap ( bg );
@@ -301,11 +294,6 @@ TabDialog::TabDialog ( const QPixmap *tabicon, const QString &tabname, TabConfig
 
-    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_iconcolumns->setValue( tc. m_iconcolumns );
     m_bgimage = tc. m_bg_image;
+    m_bgtype-> setButton ( tc. m_bg_type );
     bgTypeClicked ( tc. m_bg_type );
+
     m_fontuse-> setChecked ( tc. m_font_use );
@@ -315,2 +303,7 @@ TabDialog::TabDialog ( const QPixmap *tabicon, const QString &tabname, TabConfig
 
+    m_iconsize-> setButton ( tc. m_view );
+    iconSizeClicked ( tc. m_view );
+    iconColorClicked ( m_iconcolor-> color ( ));
+    m_iconcolumns->setValue( tc. m_iconcolumns );
+
     QWhatsThis::add ( sample, tr( "This is a rough preview of what the currently selected Tab will look like." ));
@@ -354,2 +347,3 @@ QWidget *TabDialog::createBgTab ( QWidget *parent )
     m_bgtype-> setExclusive ( true );
+    connect ( m_bgtype, SIGNAL( clicked(int)), this, SLOT( bgTypeClicked(int)));
 
@@ -394,4 +388,2 @@ QWidget *TabDialog::createBgTab ( QWidget *parent )
 
-    connect ( m_bgtype, SIGNAL( clicked(int)), this, SLOT( bgTypeClicked(int)));
-
     vertLayout-> addStretch ( 10 );
@@ -463,6 +455,2 @@ void TabDialog::bgTypeClicked ( int t )
     QString s;
-
-    if ( m_bgtype-> id ( m_bgtype-> selected ( )) != t )
-        m_bgtype-> setButton ( t );
-
     m_solidcolor-> setEnabled ( t == TabConfig::SolidColor );
@@ -473,3 +461,3 @@ void TabDialog::bgTypeClicked ( int t )
     else if ( t == TabConfig::Image )
-        s = Resource::findPixmap ( m_bgimage );
+        s = m_bgimage;
 
@@ -480,3 +468,3 @@ void TabDialog::bgColorClicked ( const QColor & )
 {
-    bgTypeClicked ( TabConfig::SolidColor );
+    m_sample-> setBackgroundType ( TabConfig::SolidColor, m_solidcolor-> color ( ). name ( ) );
 }
@@ -503,3 +491,3 @@ void TabDialog::bgImageClicked ( )
         m_bgimage = DocLnk ( file ). file ( );
-        bgTypeClicked ( TabConfig::Image );
+        m_sample-> setBackgroundType ( TabConfig::Image, m_bgimage );
     }
@@ -509,4 +497,6 @@ void TabDialog::bgDefaultClicked ( )
 {
+    m_bgtype-> setButton ( TabConfig::Image );
     m_bgimage = "launcher/opie-background";
     bgTypeClicked ( TabConfig::Image );
+    //m_sample-> setBackgroundType ( TabConfig::Image, m_bgimage );
 }