Use OFileDialog::getDirectory to select destination path

2 files changed, 40 insertions, 26 deletions

diff --git a/noncore/settings/packagemanager/oipkgconfigdlg.cpp b/noncore/settings/packagemanager/oipkgconfigdlg.cpp
index 1561470..ea0aef0 100644
--- a/noncore/settings/packagemanager/oipkgconfigdlg.cpp
+++ b/noncore/settings/packagemanager/oipkgconfigdlg.cpp
@@ -33,2 +33,4 @@ _;:,   .>  :=|.         This program is free software; you can
 
+#include <opie2/ofiledialog.h>
+
 #include <qpe/resource.h>
@@ -85,4 +87,2 @@ OIpkgConfigDlg::OIpkgConfigDlg( OIpkg *ipkg, bool installOptions, QWidget *paren
     }
-
-    //showMaximized();
 }
@@ -257,3 +257,3 @@ void OIpkgConfigDlg::initDestinationWidget()
     QWhatsThis::add( m_destName, tr( "Enter the name of this entry here." ) );
-    grplayout->addWidget( m_destName, 0, 1 );
+    grplayout->addMultiCellWidget( m_destName, 0, 0, 1, 2 );
 
@@ -265,2 +265,7 @@ void OIpkgConfigDlg::initDestinationWidget()
     grplayout->addWidget( m_destLocation, 1, 1 );
+    btn = new QPushButton( Resource::loadPixmap( "folder" ), QString::null, grpbox );
+    btn->setMaximumWidth( btn->height() );
+    QWhatsThis::add( btn, tr( "Tap here to select the desired location." ) );
+    connect( btn, SIGNAL(clicked()), this, SLOT(slotDestSelectPath()) );
+    grplayout->addWidget( btn, 1, 2 );
 
@@ -268,3 +273,3 @@ void OIpkgConfigDlg::initDestinationWidget()
     QWhatsThis::add( m_destActive, tr( "Tap here to indicate whether this entry is active or not." ) );
-    grplayout->addMultiCellWidget( m_destActive, 2, 2, 0, 1 );
+    grplayout->addMultiCellWidget( m_destActive, 2, 2, 0, 2 );
 
@@ -273,3 +278,3 @@ void OIpkgConfigDlg::initDestinationWidget()
     connect( btn, SIGNAL(clicked()), this, SLOT(slotDestUpdate()) );
-    grplayout->addMultiCellWidget( btn, 3, 3, 0, 1 );
+    grplayout->addMultiCellWidget( btn, 3, 3, 0, 2 );
 }
@@ -586,2 +591,10 @@ void OIpkgConfigDlg::slotDestDelete()
 
+void OIpkgConfigDlg::slotDestSelectPath()
+{
+    QString path = Opie::Ui::OFileDialog::getDirectory( 0, m_destLocation->text() );
+    if ( path.at( path.length() - 1 ) == '/' )
+        path.truncate( path.length() - 1 );
+    m_destLocation->setText( path );
+}
+
 void OIpkgConfigDlg::slotDestUpdate()
diff --git a/noncore/settings/packagemanager/oipkgconfigdlg.h b/noncore/settings/packagemanager/oipkgconfigdlg.h
index 800d94a..a4e4f82 100644
--- a/noncore/settings/packagemanager/oipkgconfigdlg.h
+++ b/noncore/settings/packagemanager/oipkgconfigdlg.h
@@ -1,26 +1,26 @@
 /*
-                            This file is part of the Opie Project
+                    This file is part of the Opie Project
 
-                             Copyright (c)  2003 Dan Williams <drw@handhelds.org>
+                      Copyright (c)  2003 Dan Williams <drw@handhelds.org>
               =.
             .=l.
-           .>+-=
- _;:,     .>    :=|.         This program is free software; you can
-.> <`_,   >  .   <=          redistribute it and/or  modify it under
-:`=1 )Y*s>-.--   :           the terms of the GNU Library 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 program 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
-..}^=.=       =       ;      Library General Public License for more
-++=   -.     .`     .:       details.
- :     =  ...= . :.=-
- -.   .:....=;==+<;          You should have received a copy of the GNU
-  -_. . .   )=.  =           Library General Public License along with
-    --        :-=`           this library; see the file COPYING.LIB.
+     .>+-=
+_;:,   .>  :=|.         This program is free software; you can
+.> <`_,  > .  <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--  :           the terms of the GNU Library 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 program 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
+..}^=.=    =    ;      Library General Public License for more
+++=  -.   .`   .:       details.
+:   = ...= . :.=-
+-.  .:....=;==+<;          You should have received a copy of the GNU
+ -_. . .  )=. =           Library General Public License along with
+  --    :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
@@ -127,2 +127,3 @@ private slots:
     void slotDestDelete();
+    void slotDestSelectPath();
     void slotDestUpdate();