icon changes

2 files changed, 46 insertions, 45 deletions

diff --git a/core/settings/launcher/launchersettings.cpp b/core/settings/launcher/launchersettings.cpp
index 7b85602..cb6e98a 100644
--- a/core/settings/launcher/launchersettings.cpp
+++ b/core/settings/launcher/launchersettings.cpp
@@ -1 +1,2 @@
+
 /*
@@ -17,3 +18,3 @@
 ..}^=.=       =       ;      Public License for more details.
-++=   -.     .`     .:       
+++=   -.     .`     .:
  :     =  ...= . :.=-        You should have received a copy of the GNU
@@ -51,6 +52,6 @@ LauncherSettings::LauncherSettings ( ) : QDialog ( 0, "LauncherSettings", false,
 
-        tw-> addTab ( m_taskbar, "launchersettings/taskbartab.png", tr( "Taskbar" ));
-        tw-> addTab ( m_menu, "launchersettings/menutab.png", tr( "O-Menu" ));
+        tw-> addTab ( m_taskbar, "wait", tr( "Taskbar" ));
+        tw-> addTab ( m_menu, "go", tr( "O-Menu" ));
         tw-> addTab ( m_tabs, "launchersettings/tabstab.png", tr( "Tabs" ));
-        
+
         tw-> setCurrentTab ( m_taskbar );
diff --git a/core/settings/launcher/tabdialog.cpp b/core/settings/launcher/tabdialog.cpp
index 4c9942f..5f68010 100644
--- a/core/settings/launcher/tabdialog.cpp
+++ b/core/settings/launcher/tabdialog.cpp
@@ -17,3 +17,3 @@
 ..}^=.=       =       ;      Public License for more details.
-++=   -.     .`     .:       
+++=   -.     .`     .:
  :     =  ...= . :.=-        You should have received a copy of the GNU
@@ -54,3 +54,3 @@ public:
         SampleItem ( QIconView *v, const QString &text, const QPixmap &pix ) : QIconViewItem ( v, text )
-                {
+        {
                 m_large = pix;
@@ -58,3 +58,3 @@ public:
         }
-        
+
         void sizeChange ( )
@@ -64,6 +64,6 @@ public:
         }
-        
-        QPixmap *pixmap ( ) const 
+
+        QPixmap *pixmap ( ) const
         {
-                if ( iconView ( )-> itemTextPos ( ) == QIconView::Right ) 
+                if ( iconView ( )-> itemTextPos ( ) == QIconView::Right )
                         return (QPixmap *) &m_small;
@@ -72,3 +72,3 @@ public:
         }
-        
+
 private:
@@ -93,10 +93,10 @@ public:
 
-                new SampleItem ( this, tr( "Sample 1" ), Resource::loadPixmap ( "DateBook" ));
+                new SampleItem ( this, tr( "Sample 1" ), Resource::loadPixmap ( "datebook/DateBook" ));
                 new SampleItem ( this, tr( "Sample 2" ), Resource::loadPixmap ( "Calibrate" ));
                 new SampleItem ( this, tr( "Sample 3" ), Resource::loadPixmap ( "UnknownDocument" ));
-                
+
                 setBackgroundType ( TabConfig::Ruled, QString::null );
-                
+
                 setMaximumHeight ( firstItem ( )-> height ( ) + 16 );
-        }           
+        }
 
@@ -107,3 +107,3 @@ public:
                 switch ( m ) {
-                                case TabConfig::List:                   
+                        case TabConfig::List:
                                 setItemTextPos( QIconView::Right );
@@ -121,3 +121,3 @@ public:
                 update ( );
-        } 
+        }
 
@@ -190,3 +190,3 @@ public:
         }
-                            
+
         void calculateGrid ( ItemTextPos pos )
@@ -204,3 +204,3 @@ public:
                         setGridY ( fontMetrics ( ). height ( ) * 2 + 24 );
-                } 
+                }
                 else {
@@ -216,3 +216,3 @@ public:
         }
-                                                                                                                                                                  
+
         void paletteChange( const QPalette &p )
@@ -220,3 +220,3 @@ public:
                 static bool excllock = false;
-                
+
                 if ( excllock )
@@ -224,3 +224,3 @@ public:
                 excllock = true;
-        
+
                 unsetPalette ( );
@@ -232,7 +232,7 @@ public:
                 setPalette ( QPalette ( cg, cg, cg ));
-                
+
                 excllock = false;
         }
-                            
-        void setBackgroundPixmap ( const QPixmap &pm ) 
+
+        void setBackgroundPixmap ( const QPixmap &pm )
         {
@@ -240,4 +240,4 @@ public:
         }
-        
-        void setBackgroundColor ( const QColor &c ) 
+
+        void setBackgroundColor ( const QColor &c )
         {
@@ -249,5 +249,5 @@ public:
                 if ( !m_bgpix. isNull ( )) {
-                        p-> drawTiledPixmap ( r, m_bgpix, QPoint (( r. x ( ) + contentsX ( )) % m_bgpix. width ( ), 
+                        p-> drawTiledPixmap ( r, m_bgpix, QPoint (( r. x ( ) + contentsX ( )) % m_bgpix. width ( ),
                                                                   ( r. y ( ) + contentsY ( )) % m_bgpix. height ( )));
-                } 
+                }
                 else
@@ -255,3 +255,3 @@ public:
         }
-        
+
 private:
@@ -275,5 +275,5 @@ TabDialog::TabDialog ( const QPixmap *tabicon, const QString &tabname, TabConfig
 
-        tw-> addTab ( bgtab = createBgTab ( tw ), "appearance/backgroundtabicon.png", tr( "Background" ));
-        tw-> addTab ( createFontTab ( tw ), "appearance/fonttabicon.png", tr( "Font" ));
-        tw-> addTab ( createIconTab ( tw ), "appearance/colorstabicon.png", tr( "Icons" ) );
+        tw-> addTab ( bgtab = createBgTab ( tw ), "appearance/color", tr( "Background" ));
+        tw-> addTab ( createFontTab ( tw ), "font", tr( "Font" ));
+        tw-> addTab ( createIconTab ( tw ), "pixmap", tr( "Icons" ) );
 
@@ -377,6 +377,6 @@ QWidget *TabDialog::createBgTab ( QWidget *parent )
         hb-> addStretch ( 10 );
-        
+
     gridLayout-> addLayout ( hb, 2, 1 );
 
-                QPushButton *p = new QPushButton ( tr( "Default" ), tab );
+        QPushButton *p = new QPushButton ( tr( "Default" ), tab );
         connect ( p, SIGNAL( clicked ( )), this, SLOT( bgDefaultClicked ( )));
@@ -395,3 +395,3 @@ QWidget *TabDialog::createIconTab ( QWidget *parent )
     QVBoxLayout *vertLayout = new QVBoxLayout( tab, 3, 3 );
-        
+
     QGridLayout* gridLayout = new QGridLayout ( vertLayout );
@@ -450,3 +450,3 @@ void TabDialog::bgTypeClicked ( int t )
                 m_bgtype-> setButton ( t );
-                
+
         m_solidcolor-> setEnabled ( t == TabConfig::SolidColor );
@@ -458,3 +458,3 @@ void TabDialog::bgTypeClicked ( int t )
                 s = Resource::findPixmap ( m_bgimage );
-                
+
         m_sample-> setBackgroundType ((TabConfig::BackgroundType) t, s );
@@ -479,5 +479,5 @@ void TabDialog::bgImageClicked ( )
         QStringList list;
-                list << "image/*";
+        list << "image/*";
         types. insert ( "Images", list );
-        
+
         QString file = OFileDialog::getOpenFileName ( 1, "/", QString::null, types );
@@ -486,3 +486,3 @@ void TabDialog::bgImageClicked ( )
                 bgTypeClicked ( TabConfig::Image );
-        }                                                                    
+        }
 }
@@ -502,8 +502,8 @@ void TabDialog::accept ( )
         m_tc. m_text_color = m_iconcolor-> color ( ). name ( );
-                
+
         m_tc. m_font_use = m_fontuse-> isChecked ( );
 
-                if ( m_tc. m_font_use ) {
+        if ( m_tc. m_font_use ) {
                 QFont f = m_fontselect-> selectedFont ( );
-        
+
                 m_tc. m_font_family = f. family ( );
@@ -513,3 +513,3 @@ void TabDialog::accept ( )
         }
-        
+
         QDialog::accept ( );