Fix default settings for background in Edit tab dialog

1 files changed, 18 insertions, 28 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
@@ -156,22 +156,15 @@ public:
                     setBackgroundColor ( val );
                 break;
             }
 
             case TabConfig::Image: {
                 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 );
                 break;
             }
         }
         m_bgtype = t;
         viewport ( )-> update ( );
@@ -296,26 +289,26 @@ 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_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;
-    bgTypeClicked ( tc. m_bg_type );
+    m_bgtype-> setButton ( tc. m_bg_type );
+    bgTypeClicked( tc.m_bg_type );
+
     m_fontuse-> setChecked ( tc. m_font_use );
     m_fontselect-> setSelectedFont ( QFont ( tc. m_font_family, tc. m_font_size, tc. m_font_weight, tc. m_font_italic ));
     m_fontselect-> setEnabled ( m_fontuse-> isChecked ( ));
     fontClicked ( m_fontselect-> selectedFont ( ));
 
+    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." ));
 }
 
 
 TabDialog::~TabDialog ( )
 {
@@ -349,12 +342,13 @@ QWidget *TabDialog::createBgTab ( QWidget *parent )
 
     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 );
+    connect ( m_bgtype, SIGNAL( clicked(int)), this, SLOT( bgTypeClicked(int)));
 
     QRadioButton *rb;
     rb = new QRadioButton( tr( "Ruled" ), tab, "ruled" );
     m_bgtype-> insert ( rb, TabConfig::Ruled );
     gridLayout-> addWidget( rb, 0, 1 );
 
@@ -389,14 +383,12 @@ QWidget *TabDialog::createBgTab ( QWidget *parent )
     gridLayout-> addLayout ( hb, 2, 1 );
 
     QPushButton *p = new QPushButton ( tr( "Default" ), tab );
     connect ( p, SIGNAL( clicked()), this, SLOT( bgDefaultClicked()));
     gridLayout-> addWidget ( p, 3, 1 );
 
-    connect ( m_bgtype, SIGNAL( clicked(int)), this, SLOT( bgTypeClicked(int)));
-
     vertLayout-> addStretch ( 10 );
 
     return tab;
 }
 
 QWidget *TabDialog::createIconTab ( QWidget *parent )
@@ -458,30 +450,26 @@ void TabDialog::fontClicked ( const QFont &f )
     m_sample-> setViewFont ( f );
 }
 
 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 );
     m_imagebrowse-> setEnabled ( t == TabConfig::Image );
 
     if ( t == TabConfig::SolidColor )
         s = m_solidcolor-> color ( ). name ( );
     else if ( t == TabConfig::Image )
-        s = Resource::findPixmap ( m_bgimage );
+        s = m_bgimage;
 
     m_sample-> setBackgroundType ((TabConfig::BackgroundType) t, s );
 }
 
 void TabDialog::bgColorClicked ( const QColor & )
 {
-    bgTypeClicked ( TabConfig::SolidColor );
+    m_sample-> setBackgroundType ( TabConfig::SolidColor, m_solidcolor-> color ( ). name ( ) );
 }
 
 void TabDialog::iconColorClicked ( const QColor &col )
 {
     m_sample-> setTextColor ( col );
 }
@@ -498,20 +486,22 @@ void TabDialog::bgImageClicked ( )
 
     QString file = OFileDialog::getOpenFileName ( 1, m_tc.m_last_directory, QString::null, types );
 
     if ( !file. isEmpty ( )) {
     	m_tc.m_last_directory = QFileInfo( file ).dirPath();
         m_bgimage = DocLnk ( file ). file ( );
-        bgTypeClicked ( TabConfig::Image );
+        m_sample-> setBackgroundType ( TabConfig::Image, m_bgimage );
     }
 }
 
 void TabDialog::bgDefaultClicked ( )
 {
+    m_bgtype-> setButton ( TabConfig::Image );
     m_bgimage = "launcher/opie-background";
-    bgTypeClicked ( TabConfig::Image );
+    bgTypeClicked( TabConfig::Image );
+    //m_sample-> setBackgroundType ( TabConfig::Image, m_bgimage );
 }
 
 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 ( ));