summaryrefslogtreecommitdiff
authorspiralman <spiralman>2003-03-21 21:11:08 (UTC)
committer spiralman <spiralman>2003-03-21 21:11:08 (UTC)
commit2afcd6fa6b581f5ec7b3e65fe312ceadebb37ee7 (patch) (unidiff)
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) (show 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
@@ -58,13 +58,18 @@ MainView::MainView(QWidget *parent, const char *name) : QMainWindow(parent, name
58 58
59 http = new HttpFactory(browser); 59 http = new HttpFactory(browser);
60 60
61 if( qApp->argc() > 1 ) 61 if( qApp->argc() > 1 )
62 { 62 {
63 char **argv = qApp->argv(); 63 char **argv = qApp->argv();
64 location->setEditText( argv[1] ); 64 QString *argv1 = new QString( argv[1] );
65 if( !argv1->startsWith( "http://" ) && !argv1->startsWith( "/" ) )
66 {
67 argv1->insert( 0, QDir::currentDirPath()+"/" );
68 }
69 location->setEditText( *argv1 );
65 goClicked(); 70 goClicked();
66 } 71 }
67} 72}
68 73
69void MainView::goClicked() 74void MainView::goClicked()
70{ 75{
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
@@ -22,12 +22,13 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
22#include <qwidget.h> 22#include <qwidget.h>
23#include <qtextbrowser.h> 23#include <qtextbrowser.h>
24#include <qtoolbutton.h> 24#include <qtoolbutton.h>
25#include <qcombobox.h> 25#include <qcombobox.h>
26#include <qlayout.h> 26#include <qlayout.h>
27#include <qlineedit.h> 27#include <qlineedit.h>
28#include <qdir.h>
28 29
29#include <stdio.h> 30#include <stdio.h>
30 31
31#include "httpfactory.h" 32#include "httpfactory.h"
32 33
33class MainView : public QMainWindow 34class MainView : public QMainWindow