3 files changed, 26 insertions, 11 deletions

diff --git a/core/settings/launcher/tabconfig.h b/core/settings/launcher/tabconfig.h
index 9086341..84ba073 100644
--- a/core/settings/launcher/tabconfig.h
+++ b/core/settings/launcher/tabconfig.h
@@ -1,71 +1,72 @@
 /*
                =.            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
 :`=1 )Y*s>-.--   :           the terms of the GNU General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .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.
 
 */
 #ifndef __TABCONFIG_H__
 #define __TABCONFIG_H__
 
 struct TabConfig {
-                enum ViewMode {
+        enum ViewMode {
                 Icon,
                 List
         };
         enum BackgroundType {
                 Ruled,
                 SolidColor,
                 Image
         };
 
         ViewMode       m_view;
         BackgroundType m_bg_type;
+                QString         m_last_directory;
         QString        m_bg_image;
         QString        m_bg_color;
         QString        m_text_color;
         bool           m_font_use;
         QString        m_font_family;
         int            m_font_size;
         int            m_font_weight;
         bool           m_font_italic;
         bool           m_changed;
-        
+
         bool operator == ( const TabConfig &tc )
         {
-                return ( m_view == tc. m_view ) && 
+                return ( m_view == tc. m_view ) &&
                        ( m_bg_type == tc. m_bg_type ) &&
                        ( m_bg_image == tc. m_bg_image ) &&
                        ( m_bg_color == tc. m_bg_color ) &&
                        ( m_text_color == tc. m_text_color ) &&
-                       ( m_font_use == tc. m_font_use ) && 
+                       ( m_font_use == tc. m_font_use ) &&
                        ( m_font_use ? (
                          ( m_font_family == tc. m_font_family ) &&
                          ( m_font_size == tc. m_font_size ) &&
                          ( m_font_weight == tc. m_font_weight ) &&
                          ( m_font_italic == tc. m_font_italic )
                         ) : true );
-                        
+
         }
 };
 
 #endif
diff --git a/core/settings/launcher/tabdialog.cpp b/core/settings/launcher/tabdialog.cpp
index 546e229..cef92d9 100644
--- a/core/settings/launcher/tabdialog.cpp
+++ b/core/settings/launcher/tabdialog.cpp
@@ -7,62 +7,67 @@
 :`=1 )Y*s>-.--   :           the terms of the GNU General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .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.
 
 */
 
 #include "tabdialog.h"
 
 /* OPIE */
-#include <qpe/resource.h>
+
 #include <opie2/ofontselector.h>
 #include <opie2/otabwidget.h>
 #include <opie2/ocolorbutton.h>
 #include <opie2/ofiledialog.h>
 #include <opie2/odebug.h>
 
+/* QPE */
+#include <qpe/resource.h>
+#include <qpe/qpeapplication.h>
+
 /* QT */
 #include <qlayout.h>
 #include <qvbox.h>
 #include <qtabbar.h>
 #include <qiconview.h>
 #include <qapplication.h>
 #include <qlabel.h>
+#include <qfileinfo.h>
 #include <qradiobutton.h>
 #include <qbuttongroup.h>
 #include <qwhatsthis.h>
 #include <qcheckbox.h>
 
 
 using namespace Opie::Ui;
 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
     {
         if ( iconView ( )-> itemTextPos ( ) == QIconView::Right )
@@ -393,62 +398,63 @@ 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" );
     m_iconsize-> hide ( );
     m_iconsize-> setExclusive ( true );
 
     QRadioButton *rb;
     rb = new QRadioButton( tr( "Small" ), tab, "iconsmall" );
     m_iconsize-> insert ( rb, TabConfig::List );
     gridLayout-> addWidget( rb, 0, 1 );
 
     rb = new QRadioButton( tr( "Large" ), tab, "iconlarge" );
     m_iconsize-> insert ( rb, TabConfig::Icon );
     gridLayout-> addWidget( rb, 1, 1 );
 
     connect ( m_iconsize, SIGNAL( clicked(int)), this, SLOT( iconSizeClicked(int)));
 
-//  vertLayout-> addSpacing ( 8 );
-
-//  gridLayout = new QGridLayout ( vertLayout );
     gridLayout-> addRowSpacing ( 2, 8 );
 
     label = new QLabel ( tr( "Color:" ), tab );
     gridLayout-> addWidget ( label, 3, 0 );
 
     m_iconcolor = new Opie::OColorButton ( tab, QColor ( m_tc. m_text_color ) );
     connect ( m_iconcolor, SIGNAL( colorSelected(const QColor&)), this, SLOT( iconColorClicked(const QColor&)));
     gridLayout-> addWidget ( m_iconcolor, 3, 1, AlignLeft );
 
     vertLayout-> addStretch ( 10 );
 
+    if ( m_tc.m_last_directory == QString::null ) {
+            m_tc.m_last_directory = QPEApplication::documentDir();
+    }
+
     return tab;
 }
 
 
 void TabDialog::iconSizeClicked ( int s )
 {
     m_sample-> setViewMode ((TabConfig::ViewMode) s );
 }
 
 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 );
 
@@ -459,50 +465,52 @@ void TabDialog::bgTypeClicked ( int t )
 
     m_sample-> setBackgroundType ((TabConfig::BackgroundType) t, s );
 }
 
 void TabDialog::bgColorClicked ( const QColor & )
 {
     bgTypeClicked ( TabConfig::SolidColor );
 }
 
 void TabDialog::iconColorClicked ( const QColor &col )
 {
     m_sample-> setTextColor ( col );
 }
 
 void TabDialog::bgImageClicked ( )
 {
     // ### use OFileSelector here ###
     // this is just a quick c&p from the old appearance app
 
     MimeTypes types;
     QStringList list;
     list << "image/*";
     types. insert ( "Images", list );
 
-    QString file = OFileDialog::getOpenFileName ( 1, "/", QString::null, types );
+    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 );
     }
 }
 
 void TabDialog::bgDefaultClicked ( )
 {
     m_bgimage = "launcher/opie-background";
     bgTypeClicked ( TabConfig::Image );
 }
 
 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 ) {
         QFont f = m_fontselect-> selectedFont ( );
 
diff --git a/core/settings/launcher/tabssettings.cpp b/core/settings/launcher/tabssettings.cpp
index e5a7087..5ac625b 100644
--- a/core/settings/launcher/tabssettings.cpp
+++ b/core/settings/launcher/tabssettings.cpp
@@ -122,131 +122,137 @@ void TabsSettings::init ( )
         cfg. setGroup ( "GUI" );
         m_busyani-> setChecked ( cfg. readEntry ( "BusyType" ). lower ( ) == "animated" );
                 m_bigbusy->setChecked(  cfg. readBoolEntry ( "BigBusy" )  );
 }
 
 
 void TabsSettings::readTabSettings ( Config &cfg )
 {
         QString grp ( "Tab %1" ); // No tr
         m_tabs. clear ( );
 
         TabConfig global_def;
         global_def. m_view        = TabConfig::Icon;
         global_def. m_bg_type     = TabConfig::Ruled;
         global_def. m_bg_image    = "launcher/opie-background";
         global_def. m_bg_color    = colorGroup ( ). color ( QColorGroup::Base ). name ( );
         global_def. m_text_color  = colorGroup ( ). color ( QColorGroup::Text ). name ( );
         global_def. m_font_use    = false;
         global_def. m_font_family = font ( ). family ( );
         global_def. m_font_size   = font ( ). pointSize ( );
         global_def. m_font_weight = 50;
         global_def. m_font_italic = false;
         global_def. m_changed     = false;
 
+        Config cfg2 = Config( "Launchersettings" );
 
         for ( QStringList::Iterator it = m_ids. begin ( ); it != m_ids. end ( ); ++it ) {
                 TabConfig tc = ( it != m_ids. begin ( )) ? m_tabs [GLOBALID] : global_def;
 
                 cfg. setGroup ( grp. arg ( *it ));
+                cfg2. setGroup( grp. arg ( *it ));
 
                 QString view = cfg. readEntry ( "View" );
                 if ( view == "Icon" ) // No tr
                         tc. m_view = TabConfig::Icon;
                 if ( view == "List" ) // No tr
                         tc. m_view = TabConfig::List;
 
                 QString bgType = cfg. readEntry ( "BackgroundType" );
                 if ( bgType == "Image" )
                         tc. m_bg_type = TabConfig::Image;
                 else if ( bgType == "SolidColor" )
                         tc. m_bg_type = TabConfig::SolidColor;
                 else if ( bgType == "Image" ) // No tr
                         tc. m_bg_type = TabConfig::Image;
 
                 tc. m_bg_image = cfg. readEntry ( "BackgroundImage", tc. m_bg_image );
+                tc. m_last_directory = cfg2.readEntry( "DefaultDir", "" );
                 tc. m_bg_color = cfg. readEntry ( "BackgroundColor", tc. m_bg_color );
                 tc. m_text_color = cfg. readEntry ( "TextColor", tc. m_text_color );
                 QStringList f = cfg. readListEntry ( "Font", ',' );
                 if ( f. count ( ) == 4 ) {
                         tc. m_font_use = true;
                         tc. m_font_family = f [0];
                         tc. m_font_size = f [1]. toInt ( );
                         tc. m_font_weight = f [2]. toInt ( );
                         tc. m_font_italic = ( f [3]. toInt ( ));
                 }
                 m_tabs [*it] = tc;
         }
 
         // if all tabs have the same config, then initialize the GLOBALID tab to these values
 
         TabConfig *first = 0;
         bool same = true;
 
         for ( QStringList::Iterator it = m_ids. begin ( ); it != m_ids. end ( ); ++it ) {
                 if ( *it == GLOBALID )
                         continue;
                 else if ( !first )
                         first = &m_tabs [*it];
                 else
                         same &= ( *first == m_tabs [*it] );
         }
         if ( same ) {
                 m_tabs [GLOBALID] = *first;
                 m_tabs [GLOBALID]. m_changed = true;
         }
 }
 
 
 void TabsSettings::accept ( )
 {
         Config cfg ( "Launcher" );
+        Config cfg2 ( "Launchersettings" );
 
         // Launcher Tab
         QString grp ( "Tab %1" ); // No tr
 
         for ( QStringList::Iterator it = m_ids. begin ( ); it != m_ids. end ( ); ++it ) {
                 TabConfig &tc = m_tabs [*it];
 
                 if ( !tc. m_changed )
                         continue;
 
                 cfg. setGroup ( grp. arg ( *it ));
+                cfg2. setGroup ( grp. arg ( *it ));
                 switch ( tc. m_view ) {
                         case TabConfig::Icon:
                                 cfg.writeEntry ( "View", "Icon" );
                                 break;
                         case TabConfig::List:
                                 cfg.writeEntry ( "View", "List" );
                                 break;
                 }
 
                 QCopEnvelope e ( "QPE/Launcher", "setTabView(QString,int)" );
                 e << *it << tc. m_view;
 
                 cfg. writeEntry ( "BackgroundImage", tc. m_bg_image );
                 cfg. writeEntry ( "BackgroundColor", tc. m_bg_color );
                 cfg. writeEntry ( "TextColor", tc. m_text_color );
+                cfg2. writeEntry ( "DefaultDir", tc.m_last_directory );
 
                 if ( tc. m_font_use ) {
                         QString f = tc. m_font_family + "," + QString::number ( tc. m_font_size ) + "," + QString::number ( tc. m_font_weight ) + "," + ( tc. m_font_italic ? "1" : "0" );
                         cfg. writeEntry ( "Font", f );
                 }
                 else
                         cfg. removeEntry ( "Font" );
 
                 QCopEnvelope be ( "QPE/Launcher", "setTabBackground(QString,int,QString)" );
 
                 switch ( tc. m_bg_type ) {
                         case TabConfig::Ruled:
                                 cfg.writeEntry( "BackgroundType", "Ruled" );
                                 be << *it << tc. m_bg_type << QString("");
                                 break;
                         case TabConfig::SolidColor:
                                 cfg.writeEntry( "BackgroundType", "SolidColor" );
                                 be << *it << tc. m_bg_type << tc. m_bg_color;
                                 break;
                         case TabConfig::Image:
                                 cfg.writeEntry( "BackgroundType", "Image" );
                                 be << *it << tc. m_bg_type << tc. m_bg_image;
                                 break;
                 }