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,6 +1,7 @@
+
 /*
                =.            This file is part of the OPIE Project
              .=l.            Copyright (c)  2002 Robert Griebl <sandman@handhelds.org>
            .>+-=
  _;:,     .>    :=|.         This file is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or modify it under
@@ -12,13 +13,13 @@
     .i_,=:_.      -<s.       This file is distributed in the hope that
      +  .  -:.       =       it will be useful, but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU General
 ..}^=.=       =       ;      Public License for more details.
-++=   -.     .`     .:       
+++=   -.     .`     .:
  :     =  ...= . :.=-        You should have received a copy of the GNU
  -.   .:....=;==+<;          General Public License along with this file;
   -_. . .   )=.  =           see the file COPYING. If not, write to the
     --        :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
@@ -46,16 +47,16 @@ LauncherSettings::LauncherSettings ( ) : QDialog ( 0, "LauncherSettings", false,
         lay-> addWidget ( tw );
 
         m_tabs = new TabsSettings ( tw );
         m_taskbar = new TaskbarSettings ( tw );
         m_menu = new MenuSettings ( tw );
 
-        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 );
 }
 
 void LauncherSettings::accept ( )
 {
         m_taskbar-> accept ( );
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
@@ -12,13 +12,13 @@
     .i_,=:_.      -<s.       This file is distributed in the hope that
      +  .  -:.       =       it will be useful, but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU General
 ..}^=.=       =       ;      Public License for more details.
-++=   -.     .`     .:       
+++=   -.     .`     .:
  :     =  ...= . :.=-        You should have received a copy of the GNU
  -.   .:....=;==+<;          General Public License along with this file;
   -_. . .   )=.  =           see the file COPYING. If not, write to the
     --        :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
@@ -49,31 +49,31 @@
 #include "tabdialog.h"
 
 
 class SampleItem : public QIconViewItem {
 public:
         SampleItem ( QIconView *v, const QString &text, const QPixmap &pix ) : QIconViewItem ( v, text )
-                {
+        {
                 m_large = pix;
                 m_small. convertFromImage ( pix. convertToImage ( ). smoothScale ( pix. width ( ) / 2, pix. height ( ) / 2 ));
         }
-        
+
         void sizeChange ( )
         {
                 calcRect ( );
                 repaint ( );
         }
-        
-        QPixmap *pixmap ( ) const 
+
+        QPixmap *pixmap ( ) const
         {
-                if ( iconView ( )-> itemTextPos ( ) == QIconView::Right ) 
+                if ( iconView ( )-> itemTextPos ( ) == QIconView::Right )
                         return (QPixmap *) &m_small;
                 else
                         return (QPixmap *) &m_large;
         }
-        
+
 private:
         QPixmap m_large, m_small;
 };
 
 class SampleView : public QIconView {
 public:
@@ -88,27 +88,27 @@ public:
                 setSelectionMode ( QIconView::NoSelection );
                 setBackgroundMode ( PaletteBase );
                 setViewMode ( TabConfig::Icon );
                 calculateGrid ( Bottom );
 
 
-                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 );
-        }           
+        }
 
         void setViewMode ( TabConfig::ViewMode m )
         {
                 viewport ( )-> setUpdatesEnabled ( false );
 
                 switch ( m ) {
-                                case TabConfig::List:                   
+                        case TabConfig::List:
                                 setItemTextPos( QIconView::Right );
                                 break;
                         case TabConfig::Icon:
                                 setItemTextPos( QIconView::Bottom );
                                 break;
                 }
@@ -116,13 +116,13 @@ public:
 
                 for ( QIconViewItem *it = firstItem ( ); it; it = it-> nextItem ( ))
                         ((SampleItem *) it )-> sizeChange ( );
                 arrangeItemsInGrid ( true );
                 viewport ( )-> setUpdatesEnabled ( true );
                 update ( );
-        } 
+        }
 
 
         void setBackgroundType( TabConfig::BackgroundType t, const QString &val )
         {
                 switch ( t ) {
                         case TabConfig::Ruled: {
@@ -185,13 +185,13 @@ public:
 
         void setItemTextPos ( ItemTextPos pos )
         {
                 calculateGrid ( pos );
                 QIconView::setItemTextPos( pos );
         }
-                            
+
         void calculateGrid ( ItemTextPos pos )
         {
                 int dw = QApplication::desktop ( )-> width ( );
                 int viewerWidth = dw - style ( ).scrollBarExtent ( ). width ( );
                 if ( pos == Bottom ) {
                         int cols = 3;
@@ -199,64 +199,64 @@ public:
                                 cols = 2;
                         else if ( viewerWidth >= 400 )
                                 cols = viewerWidth/96;
                         setSpacing ( 4 );
                         setGridX (( viewerWidth - ( cols + 1 ) * spacing ( )) / cols );
                         setGridY ( fontMetrics ( ). height ( ) * 2 + 24 );
-                } 
+                }
                 else {
                         int cols = 2;
                         if ( viewerWidth < 150 )
                                 cols = 1;
                         else if ( viewerWidth >= 400 )
                                 cols = viewerWidth / 150;
                         setSpacing ( 2 );
                         setGridX (( viewerWidth - ( cols + 1 ) * spacing ( )) / cols );
                         setGridY ( fontMetrics ( ). height ( ) + 2 );
                 }
         }
-                                                                                                                                                                  
+
         void paletteChange( const QPalette &p )
         {
                 static bool excllock = false;
-                
+
                 if ( excllock )
                         return;
                 excllock = true;
-        
+
                 unsetPalette ( );
                 QIconView::paletteChange ( p );
                 if ( m_bgtype == TabConfig::Ruled )
                         setBackgroundType ( TabConfig::Ruled, QString::null );
                 QColorGroup cg = colorGroup ( );
                 cg.setColor ( QColorGroup::Text, m_textcolor );
                 setPalette ( QPalette ( cg, cg, cg ));
-                
+
                 excllock = false;
         }
-                            
-        void setBackgroundPixmap ( const QPixmap &pm ) 
+
+        void setBackgroundPixmap ( const QPixmap &pm )
         {
                 m_bgpix = pm;
         }
-        
-        void setBackgroundColor ( const QColor &c ) 
+
+        void setBackgroundColor ( const QColor &c )
         {
                 m_bgcolor = c;
         }
 
         void drawBackground ( QPainter *p, const QRect &r )
         {
                 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
                         p-> fillRect ( r, m_bgcolor );
         }
-        
+
 private:
         QColor m_textcolor;
         QColor m_bgcolor;
         QPixmap m_bgpix;
         TabConfig::BackgroundType m_bgtype;
 };
@@ -270,15 +270,15 @@ TabDialog::TabDialog ( const QPixmap *tabicon, const QString &tabname, TabConfig
 
         QVBoxLayout *lay = new QVBoxLayout ( this, 3, 3 );
 
         OTabWidget *tw = new OTabWidget ( this, "tabwidget", OTabWidget::Global, OTabWidget::Bottom );
         QWidget *bgtab;
 
-        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" ) );
 
         tw-> setCurrentTab ( bgtab );
 
         QWidget *sample = new QVBox ( this );
         QTabBar *tb = new QTabBar ( sample );
         QString name ( tr( "Previewing %1" ). arg ( tabname ));
@@ -372,16 +372,16 @@ QWidget *TabDialog::createBgTab ( QWidget *parent )
     hb-> addSpacing ( 10 );
 
         m_imagebrowse = new QPushButton ( tr( "Select..." ), tab );
         connect ( m_imagebrowse, SIGNAL( clicked ( )), this, SLOT( bgImageClicked ( )));
         hb-> addWidget ( m_imagebrowse );
         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 ( )));
         gridLayout-> addWidget ( p, 3, 1 );
 
         connect ( m_bgtype, SIGNAL( clicked ( int )), this, SLOT( bgTypeClicked ( int )));
 
         vertLayout-> addStretch ( 10 );
@@ -390,13 +390,13 @@ QWidget *TabDialog::createBgTab ( QWidget *parent )
 }
 
 QWidget *TabDialog::createIconTab ( QWidget *parent )
 {
     QWidget *tab = new QWidget( parent, "IconTab" );
     QVBoxLayout *vertLayout = new QVBoxLayout( tab, 3, 3 );
-        
+
     QGridLayout* gridLayout = new QGridLayout ( vertLayout );
     gridLayout-> setColStretch ( 1, 10 );
 
     QLabel* label = new QLabel( tr( "Size:" ), tab );
     gridLayout-> addWidget ( label, 0, 0 );
     m_iconsize = new QButtonGroup( tab, "buttongroup" );
@@ -445,21 +445,21 @@ void TabDialog::fontClicked ( const QFont &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 );
-                
+
         m_sample-> setBackgroundType ((TabConfig::BackgroundType) t, s );
 }
 
 void TabDialog::bgColorClicked ( const QColor & )
 {
         bgTypeClicked ( TabConfig::SolidColor );
@@ -474,20 +474,20 @@ void TabDialog::bgImageClicked ( )
 {
         // ### use OFileSelector here ###
         // this is just a quick c&p from the old appearance app
 
         MimeTypes types;
         QStringList list;
-                list << "image/*";
+        list << "image/*";
         types. insert ( "Images", list );
-        
+
         QString file = OFileDialog::getOpenFileName ( 1, "/", QString::null, types );
         if ( !file. isEmpty ( )) {
                 m_bgimage = DocLnk ( file ). file ( );
                 bgTypeClicked ( TabConfig::Image );
-        }                                                                    
+        }
 }
 
 void TabDialog::bgDefaultClicked ( )
 {
         m_bgimage = "launcher/opie-background";
         bgTypeClicked ( TabConfig::Image );
@@ -497,20 +497,20 @@ 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_bg_image = m_bgimage;
         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 ( );
                 m_tc. m_font_size = f. pointSize ( );
                 m_tc. m_font_weight = f. weight ( );
                 m_tc. m_font_italic = f. italic ( );
         }
-        
+
         QDialog::accept ( );
 }