author | spiralman <spiralman> | 2003-03-21 21:11:08 (UTC) |
---|---|---|
committer | spiralman <spiralman> | 2003-03-21 21:11:08 (UTC) |
commit | 2afcd6fa6b581f5ec7b3e65fe312ceadebb37ee7 (patch) (unidiff) | |
tree | e5309559f1c024eb0fb9a65021468265e0324349 /noncore/net/ubrowser | |
parent | 3ed4386c2ee0e411fa3a8f9a81c3d6c86855d385 (diff) | |
download | opie-2afcd6fa6b581f5ec7b3e65fe312ceadebb37ee7.zip opie-2afcd6fa6b581f5ec7b3e65fe312ceadebb37ee7.tar.gz opie-2afcd6fa6b581f5ec7b3e65fe312ceadebb37ee7.tar.bz2 |
fixed loading of files from commandline using relative filenames
-rw-r--r-- | noncore/net/ubrowser/mainview.cpp | 7 | ||||
-rw-r--r-- | noncore/net/ubrowser/mainview.h | 1 |
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 | |||
@@ -52,25 +52,30 @@ MainView::MainView(QWidget *parent, const char *name) : QMainWindow(parent, name | |||
52 | //this doesnt seem to work, but doesnt break anything either... | 52 | //this doesnt seem to work, but doesnt break anything either... |
53 | connect(browser, SIGNAL(backwardAvailable(bool)), back, SLOT(setOn(bool)) ); | 53 | connect(browser, SIGNAL(backwardAvailable(bool)), back, SLOT(setOn(bool)) ); |
54 | connect(browser, SIGNAL(forwardAvailable(bool)), forward, SLOT(setOn(bool)) ); | 54 | connect(browser, SIGNAL(forwardAvailable(bool)), forward, SLOT(setOn(bool)) ); |
55 | 55 | ||
56 | //notify me when the text of the browser has changed (like when the user clicks a link) | 56 | //notify me when the text of the browser has changed (like when the user clicks a link) |
57 | connect(browser, SIGNAL(textChanged()), this, SLOT(textChanged()) ); | 57 | connect(browser, SIGNAL(textChanged()), this, SLOT(textChanged()) ); |
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 | ||
69 | void MainView::goClicked() | 74 | void MainView::goClicked() |
70 | { | 75 | { |
71 | location->insertItem( location->currentText() ); | 76 | location->insertItem( location->currentText() ); |
72 | 77 | ||
73 | if(location->currentText().startsWith("http://") ) | 78 | if(location->currentText().startsWith("http://") ) |
74 | { | 79 | { |
75 | location->setEditText(location->currentText().lower()); | 80 | location->setEditText(location->currentText().lower()); |
76 | browser->setMimeSourceFactory(http); | 81 | browser->setMimeSourceFactory(http); |
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 | |||
@@ -16,24 +16,25 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |||
16 | 16 | ||
17 | #include <qpe/resource.h> | 17 | #include <qpe/resource.h> |
18 | #include <qpe/qpetoolbar.h> | 18 | #include <qpe/qpetoolbar.h> |
19 | 19 | ||
20 | #include <qapplication.h> | 20 | #include <qapplication.h> |
21 | #include <qmainwindow.h> | 21 | #include <qmainwindow.h> |
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 | ||
33 | class MainView : public QMainWindow | 34 | class MainView : public QMainWindow |
34 | { | 35 | { |
35 | Q_OBJECT | 36 | Q_OBJECT |
36 | public: | 37 | public: |
37 | MainView(QWidget *parent=0, const char *name=0); | 38 | MainView(QWidget *parent=0, const char *name=0); |
38 | public slots: | 39 | public slots: |
39 | void goClicked(); | 40 | void goClicked(); |