fixed commandline argument reading, made ubrowser a "document-oriented application" (implemented setDocument, etc)

4 files changed, 44 insertions, 26 deletions

diff --git a/noncore/net/ubrowser/httpfactory.cpp b/noncore/net/ubrowser/httpfactory.cpp
index 154d5d0..b57149f 100644
--- a/noncore/net/ubrowser/httpfactory.cpp
+++ b/noncore/net/ubrowser/httpfactory.cpp
@@ -41,3 +41,3 @@ const QMimeSource * HttpFactory::data(const QString &abs_name) const
 	
-	printf("%s\n", name.latin1());
+//	printf("%s\n", name.latin1());
 
@@ -75,3 +75,3 @@ const QMimeSource * HttpFactory::data(const QString &abs_name) const
 
-	printf("%s %s %d\n", host.latin1(), file.latin1(), port);
+//	printf("%s %s %d\n", host.latin1(), file.latin1(), port);
 	
@@ -109,3 +109,3 @@ const QMimeSource * HttpFactory::data(const QString &abs_name) const
 	QByteArray data;
-	printf( "HttpFactory::data: %s\n", inet_ntoa(*((struct in_addr *)serverInfo->h_addr )) );
+//	printf( "HttpFactory::data: %s\n", inet_ntoa(*((struct in_addr *)serverInfo->h_addr )) );
 	
@@ -147,4 +147,4 @@ const QMimeSource * HttpFactory::data(const QString &abs_name) const
 	bytesSent = send( con, request.latin1(), request.length(), 0);
-	printf("HttpFactory::data: bytes written: %d out of: %d\n", bytesSent, request.length() );
-	printf("HttpFactory::data: request sent:\n%s", request.latin1());
+//	printf("HttpFactory::data: bytes written: %d out of: %d\n", bytesSent, request.length() );
+//	printf("HttpFactory::data: request sent:\n%s", request.latin1());
 	
@@ -218,3 +218,3 @@ const QByteArray HttpFactory::processResponse( int sockfd, bool &isText ) const
 				chunked = true;
-				printf( "HttpFactory::processResponse: chunked encoding\n" );
+//				printf( "HttpFactory::processResponse: chunked encoding\n" );
 			}
@@ -224,3 +224,3 @@ const QByteArray HttpFactory::processResponse( int sockfd, bool &isText ) const
 				isText = true;
-				printf( "HttpFactory::processResponse: content type text\n" );
+//				printf( "HttpFactory::processResponse: content type text\n" );
 				if( currentLine.contains( "html", false ) >= 1)
@@ -228,3 +228,3 @@ const QByteArray HttpFactory::processResponse( int sockfd, bool &isText ) const
 					browser->setTextFormat(Qt::RichText);
-					printf( "HttpFactory::processResponse: content type html\n" );
+//					printf( "HttpFactory::processResponse: content type html\n" );
 				}
@@ -235,3 +235,3 @@ const QByteArray HttpFactory::processResponse( int sockfd, bool &isText ) const
 				isText = false;
-				printf( "HttpFactory::processResponse: content type image\n" );
+//				printf( "HttpFactory::processResponse: content type image\n" );
 			}
@@ -242,3 +242,3 @@ const QByteArray HttpFactory::processResponse( int sockfd, bool &isText ) const
 				dataLength = currentLine.toInt();
-				printf( "HttpFactory::processResponse: content length: %d\n", dataLength );
+//				printf( "HttpFactory::processResponse: content length: %d\n", dataLength );
 			}
@@ -247,3 +247,3 @@ const QByteArray HttpFactory::processResponse( int sockfd, bool &isText ) const
 			{
-				printf( "HttpFactory::processResponse: 404 error\n" );
+//				printf( "HttpFactory::processResponse: 404 error\n" );
 				return 0;
@@ -252,3 +252,3 @@ const QByteArray HttpFactory::processResponse( int sockfd, bool &isText ) const
 			currentLine = "";
-			printf("HttpFactory::processResponse: reseting currentLine: %s\n", currentLine.latin1() );
+//			printf("HttpFactory::processResponse: reseting currentLine: %s\n", currentLine.latin1() );
 		}
@@ -259,3 +259,3 @@ const QByteArray HttpFactory::recieveNormal( int sockfd, int dataLen ) const
 {
-	printf( "HttpFactory::recieveNormal: recieving w/out chunked encoding\n" );
+//	printf( "HttpFactory::recieveNormal: recieving w/out chunked encoding\n" );
 	
@@ -285,3 +285,3 @@ const QByteArray HttpFactory::recieveNormal( int sockfd, int dataLen ) const
 	
-	printf( "HttpFactory::recieveNormal: end of data\n" );
+//	printf( "HttpFactory::recieveNormal: end of data\n" );
 	return data;
@@ -291,3 +291,3 @@ const QByteArray HttpFactory::recieveChunked( int sockfd ) const
 {
-	printf( "HttpFactory::recieveChunked: recieving data with chunked encoding\n" );
+//	printf( "HttpFactory::recieveChunked: recieving data with chunked encoding\n" );
 	
@@ -308,5 +308,5 @@ const QByteArray HttpFactory::recieveChunked( int sockfd ) const
 	
-	printf( "HttpFactory::recieveChunked: cSizeS: %s\n", cSizeS.latin1() );
+//	printf( "HttpFactory::recieveChunked: cSizeS: %s\n", cSizeS.latin1() );
 	cSize = cSizeS.toInt( 0, 16 );
-	printf( "HttpFactory::recieveChunked: first chunk of size: %d\n", cSize );
+//	printf( "HttpFactory::recieveChunked: first chunk of size: %d\n", cSize );
 	
@@ -357,5 +357,5 @@ const QByteArray HttpFactory::recieveChunked( int sockfd ) const
 	
-		printf( "HttpFactory::recieveChunked: cSizeS: %s\n", cSizeS.latin1() );
+//		printf( "HttpFactory::recieveChunked: cSizeS: %s\n", cSizeS.latin1() );
 		cSize = cSizeS.toInt( 0, 16 );
-		printf( "HttpFactory::recieveChunked: next chunk of size: %d\n", cSize );
+//		printf( "HttpFactory::recieveChunked: next chunk of size: %d\n", cSize );
 	
@@ -373,3 +373,3 @@ const QByteArray HttpFactory::recieveChunked( int sockfd ) const
 	
-	printf( "HttpFactory::recieveChunked: end of data\n" );
+//	printf( "HttpFactory::recieveChunked: end of data\n" );
 	return data;
diff --git a/noncore/net/ubrowser/main.cpp b/noncore/net/ubrowser/main.cpp
index fe0f243..e4a873d 100644
--- a/noncore/net/ubrowser/main.cpp
+++ b/noncore/net/ubrowser/main.cpp
@@ -25,4 +25,4 @@ int main( int argc, char **argv )
 
-	a.setMainWidget( &w );
-	w.showMaximized();
+//	a.setMainWidget( &w );
+	a.showMainDocumentWidget( &w );
 	 return a.exec();
diff --git a/noncore/net/ubrowser/mainview.cpp b/noncore/net/ubrowser/mainview.cpp
index d3f4c57..f68c5db 100644
--- a/noncore/net/ubrowser/mainview.cpp
+++ b/noncore/net/ubrowser/mainview.cpp
@@ -35,2 +35,3 @@ MainView::MainView(QWidget *parent, const char *name) : QMainWindow(parent, name
 	toolbar->setHorizontalStretchable(true);
+	location->setAutoCompletion( true );
 
@@ -63,8 +64,15 @@ MainView::MainView(QWidget *parent, const char *name) : QMainWindow(parent, name
 		char **argv = qApp->argv();
-		QString *argv1 = new QString( argv[1] );
-		if( !argv1->startsWith( "http://" ) && !argv1->startsWith( "/" ) )
+		int i = 0;
+		QString *openfile = new QString( argv[0] );
+		while( openfile->contains( "ubrowser" ) == 0 && i < qApp->argc() )
 		{
-			argv1->insert( 0, QDir::currentDirPath()+"/" );
+			i++;
+			*openfile = argv[i];
 		}
-		location->setEditText( *argv1 );
+		*openfile = argv[i+1];
+		if( !openfile->startsWith( "http://" ) && !openfile->startsWith( "/" ) )
+		{
+			openfile->insert( 0, QDir::currentDirPath()+"/" );
+		}
+		location->setEditText( *openfile );
 		goClicked();
@@ -105 +113,9 @@ void MainView::textChanged()
 }
+
+void MainView::setDocument( const QString& applnk_filename )
+{
+	DocLnk *file = new DocLnk( applnk_filename );
+	
+	location->setEditText( file->file() );
+	goClicked();
+}
diff --git a/noncore/net/ubrowser/mainview.h b/noncore/net/ubrowser/mainview.h
index 1a9b0db..20e2c70 100644
--- a/noncore/net/ubrowser/mainview.h
+++ b/noncore/net/ubrowser/mainview.h
@@ -18,2 +18,3 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #include <qpe/qpetoolbar.h>
+#include <qpe/applnk.h>
 
@@ -41,2 +42,3 @@ public slots:
 	void textChanged();
+	void setDocument( const QString& applnk_filename );
 private: