summaryrefslogtreecommitdiff
authorspiralman <spiralman>2003-03-21 21:11:08 (UTC)
committer spiralman <spiralman>2003-03-21 21:11:08 (UTC)
commit2afcd6fa6b581f5ec7b3e65fe312ceadebb37ee7 (patch) (side-by-side diff)
treee5309559f1c024eb0fb9a65021468265e0324349
parent3ed4386c2ee0e411fa3a8f9a81c3d6c86855d385 (diff)
downloadopie-2afcd6fa6b581f5ec7b3e65fe312ceadebb37ee7.zip
opie-2afcd6fa6b581f5ec7b3e65fe312ceadebb37ee7.tar.gz
opie-2afcd6fa6b581f5ec7b3e65fe312ceadebb37ee7.tar.bz2
fixed loading of files from commandline using relative filenames
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/ubrowser/mainview.cpp7
-rw-r--r--noncore/net/ubrowser/mainview.h1
2 files changed, 7 insertions, 1 deletions
diff --git a/noncore/net/ubrowser/mainview.cpp b/noncore/net/ubrowser/mainview.cpp
index 7931d1a..d3f4c57 100644
--- a/noncore/net/ubrowser/mainview.cpp
+++ b/noncore/net/ubrowser/mainview.cpp
@@ -61,7 +61,12 @@ MainView::MainView(QWidget *parent, const char *name) : QMainWindow(parent, name
if( qApp->argc() > 1 )
{
char **argv = qApp->argv();
- location->setEditText( argv[1] );
+ QString *argv1 = new QString( argv[1] );
+ if( !argv1->startsWith( "http://" ) && !argv1->startsWith( "/" ) )
+ {
+ argv1->insert( 0, QDir::currentDirPath()+"/" );
+ }
+ location->setEditText( *argv1 );
goClicked();
}
}
diff --git a/noncore/net/ubrowser/mainview.h b/noncore/net/ubrowser/mainview.h
index c786eb9..1a9b0db 100644
--- a/noncore/net/ubrowser/mainview.h
+++ b/noncore/net/ubrowser/mainview.h
@@ -25,6 +25,7 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include <qcombobox.h>
#include <qlayout.h>
#include <qlineedit.h>
+#include <qdir.h>
#include <stdio.h>