summaryrefslogtreecommitdiff
authorspiralman <spiralman>2003-03-21 20:53:13 (UTC)
committer spiralman <spiralman>2003-03-21 20:53:13 (UTC)
commitdddd49cc1350f7c38917ac5eda2e9142a89d0774 (patch) (unidiff)
tree887dc189d755924ae042d766a8ed7c59d35cc9db
parentbaada724494f774e6eb2afc0eebc499c6006c586 (diff)
downloadopie-dddd49cc1350f7c38917ac5eda2e9142a89d0774.zip
opie-dddd49cc1350f7c38917ac5eda2e9142a89d0774.tar.gz
opie-dddd49cc1350f7c38917ac5eda2e9142a89d0774.tar.bz2
added support for specifying a file or url at the command line (currently must be first argument)
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/ubrowser/mainview.cpp9
-rw-r--r--noncore/net/ubrowser/mainview.h1
2 files changed, 10 insertions, 0 deletions
diff --git a/noncore/net/ubrowser/mainview.cpp b/noncore/net/ubrowser/mainview.cpp
index 179fa6b..7931d1a 100644
--- a/noncore/net/ubrowser/mainview.cpp
+++ b/noncore/net/ubrowser/mainview.cpp
@@ -48,28 +48,37 @@ MainView::MainView(QWidget *parent, const char *name) : QMainWindow(parent, name
48 connect(forward, SIGNAL(clicked()), browser, SLOT(forward()) ); 48 connect(forward, SIGNAL(clicked()), browser, SLOT(forward()) );
49 connect(home, SIGNAL(clicked()), browser, SLOT(home()) ); 49 connect(home, SIGNAL(clicked()), browser, SLOT(home()) );
50 50
51//make back and forward buttons be enabled, only when you can go back or forward (again, i love QTextBrowser) 51//make back and forward buttons be enabled, only when you can go back or forward (again, i love QTextBrowser)
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
61 if( qApp->argc() > 1 )
62 {
63 char **argv = qApp->argv();
64 location->setEditText( argv[1] );
65 goClicked();
66 }
60} 67}
61 68
62void MainView::goClicked() 69void MainView::goClicked()
63{ 70{
71 location->insertItem( location->currentText() );
72
64 if(location->currentText().startsWith("http://") ) 73 if(location->currentText().startsWith("http://") )
65 { 74 {
66 location->setEditText(location->currentText().lower()); 75 location->setEditText(location->currentText().lower());
67 browser->setMimeSourceFactory(http); 76 browser->setMimeSourceFactory(http);
68 printf("MainView::goClicked: using http source factory\n"); 77 printf("MainView::goClicked: using http source factory\n");
69 } 78 }
70 else 79 else
71 { 80 {
72 browser->setMimeSourceFactory(QMimeSourceFactory::defaultFactory()); 81 browser->setMimeSourceFactory(QMimeSourceFactory::defaultFactory());
73 printf("MainView::goClicked: using default source factory\n"); 82 printf("MainView::goClicked: using default source factory\n");
74 } 83 }
75 84
diff --git a/noncore/net/ubrowser/mainview.h b/noncore/net/ubrowser/mainview.h
index bd9d19c..c786eb9 100644
--- a/noncore/net/ubrowser/mainview.h
+++ b/noncore/net/ubrowser/mainview.h
@@ -8,24 +8,25 @@ version.
8 8
9This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the 9This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the
10implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General 10implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
11Public License for more details. 11Public License for more details.
12 12
13You should have received a copy of the GNU General Public License along with this program; if not, write to the Free 13You should have received a copy of the GNU General Public License along with this program; if not, write to the Free
14Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 14Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
15*/ 15*/
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 <qmainwindow.h> 21#include <qmainwindow.h>
21#include <qwidget.h> 22#include <qwidget.h>
22#include <qtextbrowser.h> 23#include <qtextbrowser.h>
23#include <qtoolbutton.h> 24#include <qtoolbutton.h>
24#include <qcombobox.h> 25#include <qcombobox.h>
25#include <qlayout.h> 26#include <qlayout.h>
26#include <qlineedit.h> 27#include <qlineedit.h>
27 28
28#include <stdio.h> 29#include <stdio.h>
29 30
30#include "httpfactory.h" 31#include "httpfactory.h"
31 32